Don't use r8'ed prebuilds before we archive proguard map
Additionally, since our roll is several weeks old, we want to do this as a seperate roll
Change-Id: I4e34e7294671c83b38795cd7f9874123f1a6958f
diff --git a/build.gradle b/build.gradle
index 0163c2e..ec00f11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -603,7 +603,7 @@
}
task R8R8(type: Exec) {
- def pgconf = "pgconfs/r8.cfg"
+ def pgconf = "src/main/keep.txt"
def output = "build/libs/r8-r8.jar"
inputs.files files(pgconf, "build/libs/r8.jar")
outputs.file output
@@ -614,7 +614,7 @@
}
task D8R8(type: Exec) {
- def pgconf = "pgconfs/d8.cfg"
+ def pgconf = "src/main/keep.txt"
def output = "build/libs/d8-r8.jar"
inputs.files files(pgconf, "build/libs/d8.jar")
outputs.file output
@@ -625,7 +625,7 @@
}
task CompatDxR8(type: Exec) {
- def pgconf = "pgconfs/compatdx.cfg"
+ def pgconf = "src/main/keep-compatdx.txt"
def output = "build/libs/compatdx-r8.jar"
inputs.files files(pgconf, "build/libs/compatdx.jar")
outputs.file output
@@ -636,7 +636,7 @@
}
task CompatProguardR8(type: Exec) {
- def pgconf = "pgconfs/compatproguard.cfg"
+ def pgconf = "src/main/keep-compatproguard.txt"
def output = "build/libs/compatproguard-r8.jar"
inputs.files files(pgconf, "build/libs/compatproguard.jar")
outputs.file output
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:
