Time gradle build tasks individually in archive.py

Change-Id: I23ac45e08174af8f49d457ddbe8d1c36f4f9e4ab

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index 3242efc..a84960e 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -134,21 +134,37 @@
 def RunGradleBuild(options, timing):
     if options.skip_gradle_build:
         return
-    timing.begin("Run gradle build")
+    timing.begin("Download deps")
+    gradle.RunGradle([utils.GRADLE_TASK_DOWNLOAD_DEPS, '-Pno_internal'])
+    timing.end()
+    timing.begin("Build consolidated license")
+    gradle.RunGradle([utils.GRADLE_TASK_CONSOLIDATED_LICENSE, '-Pno_internal'])
+    timing.end()
+    timing.begin("Build keep anno")
     gradle.RunGradle([
-        utils.GRADLE_TASK_CONSOLIDATED_LICENSE,
         utils.GRADLE_TASK_KEEP_ANNO_JAR,
         utils.GRADLE_TASK_KEEP_ANNO_DOC,
         utils.GRADLE_TASK_KEEP_ANNO_LEGACY_JAR,
         utils.GRADLE_TASK_KEEP_ANNO_ANDROIDX_JAR,
+        '-Pno_internal',
+    ])
+    timing.end()
+    timing.begin("Build R8")
+    gradle.RunGradle([
         utils.GRADLE_TASK_R8,
-        utils.GRADLE_TASK_R8LIB, utils.GRADLE_TASK_R8LIB_NO_DEPS,
+        utils.GRADLE_TASK_R8LIB,
+        utils.GRADLE_TASK_R8LIB_NO_DEPS,
         utils.GRADLE_TASK_THREADING_MODULE_BLOCKING,
         utils.GRADLE_TASK_THREADING_MODULE_SINGLE_THREADED,
-        utils.GRADLE_TASK_SOURCE_JAR,
-        utils.GRADLE_TASK_SWISS_ARMY_KNIFE, '-Pno_internal'
+        '-Pno_internal',
     ])
     timing.end()
+    timing.begin("Build source jar")
+    gradle.RunGradle([utils.GRADLE_TASK_SOURCE_JAR, '-Pno_internal'])
+    timing.end()
+    timing.begin("Build swiss army knife")
+    gradle.RunGradle([utils.GRADLE_TASK_SWISS_ARMY_KNIFE, '-Pno_internal'])
+    timing.end()
 
 
 def RSyncDir(src_dir, version_or_path, dst_dir, is_main, options):

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index 4e6044a..a4e8250 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -44,6 +44,7 @@
 
 GRADLE_TASK_CLEAN_TEST = ':test:cleanTest'
 GRADLE_TASK_CONSOLIDATED_LICENSE = ':main:consolidatedLicense'
+GRADLE_TASK_DOWNLOAD_DEPS = ':shared:downloadDeps'
 GRADLE_TASK_KEEP_ANNO_JAR = ':keepanno:keepAnnoAnnotationsJar'
 GRADLE_TASK_KEEP_ANNO_LEGACY_JAR = ':keepanno:keepAnnoLegacyAnnotationsJar'
 GRADLE_TASK_KEEP_ANNO_ANDROIDX_JAR = ':keepanno:keepAnnoAndroidXAnnotationsJar'