commit 54b939a6e413cb13495d07d2b3c82688027298df
author Tamas Kenez <tamaskenez@google.com> Fri Dec 07 15:55:26 2018 +0100
committer Tamas Kenez <tamaskenez@google.com> Mon Dec 10 08:54:06 2018 +0000
tree 548307f5e272081cc5c46019a2d629a2b46b4324
parent b300f53ea9875784c5070d0c9fae5964ccff8ce7

Build and archive map files for R8-processed targets.

Change-Id: Id673cd21d82b208a6e1038ae03569d9ea8af5457

build.gradle

diff --git a/build.gradle b/build.gradle
index 759e475..2eba7a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -599,7 +599,8 @@
         input,
         "--lib", "third_party/openjdk/openjdk-rt-1.8/rt.jar",
         "--output", output,
-        "--pg-conf", pgconf]
+        "--pg-conf", pgconf,
+        "--pg-map-output", output + ".map"]
 }
 
 task R8Lib(type: Exec) {

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index 302b0ff..aa3d22d 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -128,13 +128,17 @@
       utils.D8_JAR,
       utils.R8_JAR,
       utils.R8LIB_JAR,
+      utils.R8LIB_JAR + '.map',
       utils.R8_SRC_JAR,
       utils.R8_FULL_EXCLUDE_DEPS_JAR,
       utils.R8LIB_EXCLUDE_DEPS_JAR,
+      utils.R8LIB_EXCLUDE_DEPS_JAR + '.map',
       utils.COMPATDX_JAR,
       utils.COMPATDXLIB_JAR,
+      utils.COMPATDXLIB_JAR + '.map',
       utils.COMPATPROGUARD_JAR,
       utils.COMPATPROGUARDLIB_JAR,
+      utils.COMPATPROGUARDLIB_JAR + '.map',
       utils.MAVEN_ZIP,
       utils.GENERATED_LICENSE,
     ]:

tools/build_r8lib.py

diff --git a/tools/build_r8lib.py b/tools/build_r8lib.py
index 5af6d4d..5368f6f 100755
--- a/tools/build_r8lib.py
+++ b/tools/build_r8lib.py
@@ -56,7 +56,7 @@
   # Produce R8 for compiling lib
   if output_path is None:
     output_path = target + 'lib.jar'
-  output_map_path = os.path.splitext(output_path)[0] + '.map'
+  output_map_path = output_path + '.map'
   toolhelper.run(
       'r8',
       ('--release',