commit 74215b4d5be8a6564098a0e9121f8e9efece84ee
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Aug 25 09:55:56 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 28 12:52:35 2023 +0000
tree 774aee99dff040c4512c5ef3be3ce8c8d22df3aa
parent 51026a499affaa67dd181418b506b6ccaeffdd78

Extend package pattern with wildcard

Bug: b/155618698
Change-Id: Idc8de62d098a1037cb1dd04dbd3f5ba042332fe7

d8_r8/main/build.gradle.kts

diff --git a/d8_r8/main/build.gradle.kts b/d8_r8/main/build.gradle.kts
index a262dc5..4ba82d6 100644
--- a/d8_r8/main/build.gradle.kts
+++ b/d8_r8/main/build.gradle.kts
@@ -128,38 +128,40 @@
              "$deps",
              "--output",
              "$output",
+             // Add identity mapping to enforce no relocation of things already in package
+             // com.android.tools.r8.
              "--map",
-             "com.android.resources->com.android.tools.r8.com.android.resources",
+             "com.android.tools.r8.**->com.android.tools.r8",
              "--map",
-             "com.android.support->com.android.tools.r8.com.android.support",
+             "com.android.**->com.android.tools.r8.com.android",
              "--map",
-             "com.google.common->com.android.tools.r8.com.google.common",
+             "com.android.build.shrinker.**->com.android.tools.r8.resourceshrinker",
              "--map",
-             "com.android.build.shrinker->com.android.tools.r8.resourceshrinker",
+             "com.google.common.**->com.android.tools.r8.com.google.common",
              "--map",
-             "com.google.gson->com.android.tools.r8.com.google.gson",
+             "com.google.gson.**->com.android.tools.r8.com.google.gson",
              "--map",
-             "com.google.thirdparty->com.android.tools.r8.com.google.thirdparty",
+             "com.google.thirdparty.**->com.android.tools.r8.com.google.thirdparty",
              "--map",
-             "org.objectweb.asm->com.android.tools.r8.org.objectweb.asm",
+             "org.objectweb.asm.**->com.android.tools.r8.org.objectweb.asm",
              "--map",
-             "it.unimi.dsi.fastutil->com.android.tools.r8.it.unimi.dsi.fastutil",
+             "it.unimi.dsi.fastutil.**->com.android.tools.r8.it.unimi.dsi.fastutil",
              "--map",
-             "kotlin->com.android.tools.r8.jetbrains.kotlin",
+             "kotlin.**->com.android.tools.r8.jetbrains.kotlin",
              "--map",
-             "kotlinx->com.android.tools.r8.jetbrains.kotlinx",
+             "kotlinx.**->com.android.tools.r8.jetbrains.kotlinx",
              "--map",
-             "org.jetbrains->com.android.tools.r8.org.jetbrains",
+             "org.jetbrains.**->com.android.tools.r8.org.jetbrains",
              "--map",
-             "org.intellij->com.android.tools.r8.org.intellij",
+             "org.intellij.**->com.android.tools.r8.org.intellij",
              "--map",
-             "org.checkerframework->com.android.tools.r8.org.checkerframework",
+             "org.checkerframework.**->com.android.tools.r8.org.checkerframework",
              "--map",
-             "com.google.j2objc->com.android.tools.r8.com.google.j2objc",
+             "com.google.j2objc.**->com.android.tools.r8.com.google.j2objc",
              "--map",
-             "com.google.protobuf->com.android.tools.r8.com.google.protobuf",
+             "com.google.protobuf.**->com.android.tools.r8.com.google.protobuf",
              "--map",
-             "android.aapt->com.android.tools.r8.android.aaapt"
+             "android.aapt.**->com.android.tools.r8.android.aaapt"
       ))
   }
 }