commit f87f4732c8981bdfdd52c646bf2c45962f714dfe
author Søren Gjesse <sgjesse@google.com> Tue Oct 05 16:23:10 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Oct 06 06:20:43 2021 +0000
tree 55742f14fba9bf03d4607101d07dd16100ce0a78
parent c2a9e6a8757fc972a647a4059d3771206aeb5c79

Include system properties prefixed with com.android.tools.r8. in dumps

Fixes: 202143439
Change-Id: I48be583bca2307a7cddb0efe8b992553c11ead58

src/main/java/com/android/tools/r8/DumpOptions.java

diff --git a/src/main/java/com/android/tools/r8/DumpOptions.java b/src/main/java/com/android/tools/r8/DumpOptions.java
index 1c0e170..e8c6a49 100644
--- a/src/main/java/com/android/tools/r8/DumpOptions.java
+++ b/src/main/java/com/android/tools/r8/DumpOptions.java
@@ -34,6 +34,7 @@
   private static final String TREE_SHAKING_KEY = "tree-shaking";
   private static final String MINIFICATION_KEY = "minification";
   private static final String FORCE_PROGUARD_COMPATIBILITY_KEY = "force-proguard-compatibility";
+  private static final String SYSTEM_PROPERTY_PREFIX = "system-property-";
 
   private final Tool tool;
   private final CompilationMode compilationMode;
@@ -110,6 +111,15 @@
     addOptionalDumpEntry(builder, TREE_SHAKING_KEY, treeShaking);
     addOptionalDumpEntry(builder, MINIFICATION_KEY, minification);
     addOptionalDumpEntry(builder, FORCE_PROGUARD_COMPATIBILITY_KEY, forceProguardCompatibility);
+    System.getProperties()
+        .stringPropertyNames()
+        .forEach(
+            name -> {
+              if (name.startsWith("com.android.tools.r8.")) {
+                String value = System.getProperty(name);
+                addDumpEntry(builder, SYSTEM_PROPERTY_PREFIX + name, value);
+              }
+            });
     return builder.toString();
   }