commit 57ee0e61a093b506aec5e8590f8dda42e80ed081
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Jan 24 12:27:40 2023 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Jan 24 12:27:40 2023 +0100
tree cdfbcf95ee39b04412a11093f2175c3f1683b1f1
parent 1f5f21d667c0630efb4faa005620bf0a272cedb2

[Compose] Enable map composition by default

Bug: b/241763080
Change-Id: Ie23989e44d4c581651013e06350320a81f9c14ad

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 335e328..b8acebb 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1800,8 +1800,9 @@
   }
 
   public static class MappingComposeOptions {
-    // TODO(b/241763080): Remove when enabled.
-    public boolean enableExperimentalMappingComposition = false;
+    public boolean enableExperimentalMappingComposition =
+        !parseSystemPropertyForDevelopmentOrDefault(
+            "com.android.tools.r8.disableMapComposition", false);
     // TODO(b/247136434): Disable for internal builds.
     public boolean allowNonExistingOriginalRanges = true;
     public Consumer<ClassNameMapper> generatedClassNameMapperConsumer = null;