commit 8740e0f74617ae94169e7f4d46983eb5ac126276
author Rico Wind <ricow@google.com> Fri Dec 07 05:30:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 07 05:30:57 2018 +0000
tree 30a1ce7c35b258af6ec5c8f7d10e1d03a8c354bf
parent 38b04ed99a345a39a49105ceb8fd6dd9a88562fb
parent 727fd09e8722366029f667bc267b0b388f6c5936

Merge "Don't use r8'ed prebuilds before we archive proguard map"

tools/update_prebuilds_in_android.py

diff --git a/tools/update_prebuilds_in_android.py b/tools/update_prebuilds_in_android.py
index 395a4b4..490a132 100755
--- a/tools/update_prebuilds_in_android.py
+++ b/tools/update_prebuilds_in_android.py
@@ -35,8 +35,7 @@
     copyfile(src, dest)
 
 def copy_jar_targets(root, target_root):
-  # With the '-r8' postfix we're using the R8-processed jars.
-  srcs = map((lambda t: t + '-r8.jar'), JAR_TARGETS)
+  srcs = map((lambda t: t + '.jar'), JAR_TARGETS)
   dests = map((lambda t: t + '-master.jar'), JAR_TARGETS)
   copy_targets(root, target_root, srcs, dests)
 
@@ -62,13 +61,12 @@
   args = parse_arguments()
   target_root = args.android_root[0]
   if args.commit_hash == None and args.version == None:
-    gradle.RunGradle(map((lambda t: t + 'r8'), JAR_TARGETS))
+    gradle.RunGradle(map((lambda t: t), JAR_TARGETS))
     copy_jar_targets(utils.LIBS, target_root)
     copy_other_targets(utils.GENERATED_LICENSE_DIR, target_root)
   else:
     assert args.commit_hash == None or args.version == None
-    # With the '-r8' postfix we're using the R8-processed jars.
-    targets = map((lambda t: t + '-r8.jar'), JAR_TARGETS) + OTHER_TARGETS
+    targets = map((lambda t: t + '.jar'), JAR_TARGETS) + OTHER_TARGETS
     with utils.TempDir() as root:
       for target in targets:
         if args.commit_hash: