commit eda558146afccb439d65646dae1232281466bf97
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Apr 25 09:26:07 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Apr 26 11:07:31 2023 +0000
tree 8026d6e7f0ebec534eba1d21cc77c87ec9332e4a
parent e8e1574c4fdd9bba1e58347321880353f5be0830

Build and archive r8 mapping

Bug: b/274735214
Change-Id: I8687adf5d3f10096cd7a986c40192a4253784c72

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index 6a39594..d724b18 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -217,10 +217,12 @@
       utils.R8_JAR,
       utils.R8LIB_JAR,
       utils.R8LIB_JAR + '.map',
+      utils.R8LIB_JAR + '_map.zip',
       utils.R8_SRC_JAR,
       utils.R8_FULL_EXCLUDE_DEPS_JAR,
       utils.R8LIB_EXCLUDE_DEPS_JAR,
       utils.R8LIB_EXCLUDE_DEPS_JAR + '.map',
+      utils.R8LIB_EXCLUDE_DEPS_JAR + '_map.zip',
       utils.R8RETRACE_JAR,
       utils.R8RETRACE_EXCLUDE_DEPS_JAR,
       utils.MAVEN_ZIP,

tools/build_r8lib.py

diff --git a/tools/build_r8lib.py b/tools/build_r8lib.py
index 8dc0cb8..54cf915 100755
--- a/tools/build_r8lib.py
+++ b/tools/build_r8lib.py
@@ -58,6 +58,7 @@
   if output_path is None:
     output_path = target + 'lib.jar'
   output_map_path = output_path + '.map'
+  r8_output_map_path = output_path + '_map.zip'
   toolhelper.run(
       'r8',
       ('--release',
@@ -67,7 +68,8 @@
        temp_lib,
        '--output', output_path,
        '--pg-conf', keep_rules_path,
-       '--pg-map-output', output_map_path),
+       '--pg-map-output', output_map_path,
+       '--partition-map-output', r8_output_map_path),
       **kwargs)
   if exclude_deps:
     return [output_path, temp_deps]

tools/create_r8lib.py

diff --git a/tools/create_r8lib.py b/tools/create_r8lib.py
index b6189e6..51e2fd6 100755
--- a/tools/create_r8lib.py
+++ b/tools/create_r8lib.py
@@ -96,6 +96,7 @@
   cmd.extend(['--source-file-template', source_file_template])
   cmd.extend(['--output', args.output])
   cmd.extend(['--pg-map-output', args.output + '.map'])
+  cmd.extend(['--partition-map-output', args.output + '_map.zip'])
   cmd.extend(['--lib', jdk.GetJdkHome()])
   if args.pg_conf:
     for pgconf in args.pg_conf: