Place synthetic-contexts.map under META-INF/metadata/

PiperOrigin-RevId: 683244809 Change-Id: I69a3ca5451fe5bd2b60b272de0cf47b8050193a1
bazelbuild · Oct 7, 2024 · 07115c7 · 07115c7
1 parent e90b26d
commit 07115c7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/tools/java/com/google/devtools/build/android/dexer/DexFileSplitter.java b/src/tools/java/com/google/devtools/build/android/dexer/DexFileSplitter.java
@@ -151,7 +151,7 @@ static void splitIntoShards(Options options) throws IOException {
         ZipFile zip = closer.register(new ZipFile(inputArchive.toFile()));
 
         // synthetic-contexts.map is generated by CompatDexBuilder.
-        ZipEntry syntheticContextsZipEntry = zip.getEntry("META-INF/synthetic-contexts.map");
+        ZipEntry syntheticContextsZipEntry = zip.getEntry("META-INF/metadata/synthetic-contexts.map");
         if (syntheticContextsZipEntry != null) {
           parseSyntheticContextsMap(
               zip.getInputStream(syntheticContextsZipEntry), contextClassesToSyntheticClasses);

diff --git a/src/tools/java/com/google/devtools/build/android/r8/CompatDexBuilder.java b/src/tools/java/com/google/devtools/build/android/r8/CompatDexBuilder.java
@@ -323,7 +323,7 @@ private void dexEntries(
         String contextMapping = contextMappingBuilder.toString();
         if (!contextMapping.isEmpty()) {
           ZipUtils.addEntry(
-              "META-INF/synthetic-contexts.map",
+              "META-INF/metadata/synthetic-contexts.map",
               contextMapping.getBytes(UTF_8),
               ZipEntry.STORED,
               out);

diff --git a/src/tools/java/com/google/devtools/build/android/ziputils/SplitZip.java b/src/tools/java/com/google/devtools/build/android/ziputils/SplitZip.java
@@ -432,7 +432,7 @@ private void split() throws IOException {
       CentralDirectory cdir = centralDirectories.get(in.getFilename());
 
       for (DirectoryEntry entry : cdir.list()) {
-        if (entry.getFilename().equals("META-INF/synthetic-contexts.map")) {
+        if (entry.getFilename().equals("META-INF/metadata/synthetic-contexts.map")) {
           parseSyntheticContextsMap(in.entryFor(entry).getContent(), syntheticClassContexts);
           break;
         }

diff --git a/src/tools/javatests/com/google/devtools/build/android/r8/CompatDexBuilderTest.java b/src/tools/javatests/com/google/devtools/build/android/r8/CompatDexBuilderTest.java
@@ -99,7 +99,7 @@ public void compileWithSyntheticLambdas() throws Exception {
 
     try (ZipFile zipFile = new ZipFile(outputZip.toFile(), UTF_8)) {
       assertThat(zipFile.getEntry(contextName + ".class.dex")).isNotNull();
-      ZipEntry entry = zipFile.getEntry("META-INF/synthetic-contexts.map");
+      ZipEntry entry = zipFile.getEntry("META-INF/metadata/synthetic-contexts.map");
       assertThat(entry).isNotNull();
       try (BufferedReader reader =
           new BufferedReader(new InputStreamReader(zipFile.getInputStream(entry), UTF_8))) {