Remove the option for not adding a marker
This was added when DX was still used to avoid DX code merged by D8
to get a D8 marker.
Bug: b/77883315
Change-Id: I4f207d000c8d75f9d3d7bfd8a2fb769481c2a487
diff --git a/src/main/java/com/android/tools/r8/DexFileMergerHelper.java b/src/main/java/com/android/tools/r8/DexFileMergerHelper.java
index a94d834..163e476 100644
--- a/src/main/java/com/android/tools/r8/DexFileMergerHelper.java
+++ b/src/main/java/com/android/tools/r8/DexFileMergerHelper.java
@@ -62,11 +62,4 @@
D8.runForTesting(command.getInputApp(), options);
}
-
- public static void runD8ForTesting(D8Command command, boolean dontCreateMarkerInD8)
- throws CompilationFailedException {
- InternalOptions options = command.getInternalOptions();
- options.testing.dontCreateMarkerInD8 = dontCreateMarkerInD8;
- D8.runForTesting(command.getInputApp(), options);
- }
}
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 0c68c28..aa1509b 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -443,9 +443,6 @@
// Compute the marker to be placed in the main dex file.
private Marker createMarker(Tool tool) {
- if (tool == Tool.D8 && testing.dontCreateMarkerInD8) {
- return null;
- }
Marker marker =
new Marker(tool)
.setVersion(Version.LABEL)
@@ -1892,7 +1889,6 @@
public boolean enableExperimentalDesugaredLibraryKeepRuleGenerator = false;
public boolean invertConditionals = false;
public boolean placeExceptionalBlocksLast = false;
- public boolean dontCreateMarkerInD8 = false;
public boolean forceJumboStringProcessing = false;
public boolean forcePcBasedEncoding = false;
public int pcBasedDebugEncodingOverheadThreshold =
