commit 7a328103151def6d726dc4dc3a33ea34e0e5737b
author Ian Zerny <zerny@google.com> Mon Jan 16 12:38:22 2023 +0100
committer Ian Zerny <zerny@google.com> Mon Jan 16 12:45:37 2023 +0000
tree af6d51ce3720c40a64750c83afd06f9977a90aa0
parent 6bed974d1c51091c8210db41161d01d8b376d3bd

Rename internal platform bit now it is only used for marker.

Change-Id: I790554f500b052f63495f5cc9f0aca454efb29e0

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 f3f358f..f49f0d4 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -275,18 +275,14 @@
   // Configure options according to platform build assumptions.
   // See go/r8platformflag and b/232073181.
   public void configureAndroidPlatformBuild(boolean isAndroidPlatformBuild) {
-    assert !androidPlatformBuild;
+    assert !addAndroidPlatformBuildToMarker;
     if (isAndroidPlatformBuild || minApiLevel.isPlatform()) {
       apiModelingOptions().disableApiModeling();
       disableBackportsWithErrorDiagnostics = true;
-      androidPlatformBuild = isAndroidPlatformBuild;
+      addAndroidPlatformBuildToMarker = isAndroidPlatformBuild;
     }
   }
 
-  public boolean isAndroidPlatformBuild() {
-    return androidPlatformBuild;
-  }
-
   public boolean printTimes = System.getProperty("com.android.tools.r8.printtimes") != null;
   // To print memory one also have to enable printtimes.
   public boolean printMemory = System.getProperty("com.android.tools.r8.printmemory") != null;
@@ -473,7 +469,7 @@
     if (tool == Tool.R8) {
       marker.setR8Mode(forceProguardCompatibility ? "compatibility" : "full");
     }
-    if (androidPlatformBuild) {
+    if (addAndroidPlatformBuildToMarker) {
       marker.setAndroidPlatformBuild();
     }
     return marker;
@@ -607,7 +603,7 @@
   // Skipping min_api check and compiling an intermediate result intended for later merging.
   // Intermediate builds also emits or update synthesized classes mapping.
   public boolean intermediate = false;
-  private boolean androidPlatformBuild = false;
+  private boolean addAndroidPlatformBuildToMarker = false;
   public boolean retainCompileTimeAnnotations = true;
   public boolean ignoreBootClasspathEnumsForMaindexTracing =
       System.getProperty("com.android.tools.r8.ignoreBootClasspathEnumsForMaindexTracing") != null;