fetch_all.py: Fix logic that fails build when <html> is in licenses

The exception was not being checked for, and so never shown. Bug: None Change-Id: Ia61ed3cb2379defe087262d61374fbe6c6675217 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611450 Auto-Submit: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Peter Wen <wnwen@chromium.org> Commit-Queue: Peter Wen <wnwen@chromium.org> Cr-Commit-Position: refs/heads/master@{#840669}

fetch_all.py: Fix logic that fails build when <html> is in licenses
The exception was not being checked for, and so never shown. Bug: None Change-Id: Ia61ed3cb2379defe087262d61374fbe6c6675217 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611450 Auto-Submit: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Peter Wen <wnwen@chromium.org> Commit-Queue: Peter Wen <wnwen@chromium.org> Cr-Commit-Position: refs/heads/master@{#840669}
295af5fe · Andrew Grieve · Chromium LUCI CQ · 45effdcf · 295af5fe
Commit 295af5fe authored Jan 06, 2021 by Andrew Grieve Committed by Chromium LUCI CQ Jan 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy ...deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy +7 -3

No files found.
--- a/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
+++ b/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
@@ -107,6 +107,7 @@ class BuildConfigGenerator extends DefaultTask {
        // 2. Import artifacts into the local repository
        def dependencyDirectories = []
        def downloadExecutor = Executors.newCachedThreadPool()
+        def downloadTasks = []
        graph.dependencies.values().each { dependency ->
            if (excludeDependency(dependency)) {
                return
@@ -138,13 +139,13 @@ class BuildConfigGenerator extends DefaultTask {
                            new File("${normalisedRepoPath}/${dependency.licensePath}").text)
                } else if (!dependency.licenseUrl?.trim()?.isEmpty()) {
                    File destFile = new File("${absoluteDepDir}/LICENSE")
-                    downloadExecutor.submit {
+                    downloadTasks.add(downloadExecutor.submit {
                        downloadFile(dependency.id, dependency.licenseUrl, destFile)
                        if (destFile.text.contains("<html")) {
                            throw new RuntimeException("Found HTML in LICENSE file. Please add an "
                                    + "override to ChromiumDepGraph.groovy for ${dependency.id}.")
                        }
-                    }
+                    })
                } else {
                    getLogger().warn("Missing license for ${dependency.id}.")
                    getLogger().warn("License Name was: ${dependency.licenseName}")
@@ -152,7 +153,10 @@ class BuildConfigGenerator extends DefaultTask {
            }
        }
        downloadExecutor.shutdown()
-        downloadExecutor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+        // Check for exceptions.
+        for (def task : downloadTasks) {
+            task.get()
+        }

        // 3. Generate the root level build files
        updateBuildTargetDeclaration(graph, repositoryPath, normalisedRepoPath)