Rename StartupInstrumentationOptions to InstrumentationOptions
Change-Id: Ifaff6d95a4487ef4cd7c342b8923ffce234dc3d7
diff --git a/src/main/java/com/android/tools/r8/profile/startup/instrumentation/StartupInstrumentationOptions.java b/src/main/java/com/android/tools/r8/profile/startup/instrumentation/InstrumentationOptions.java
similarity index 90%
rename from src/main/java/com/android/tools/r8/profile/startup/instrumentation/StartupInstrumentationOptions.java
rename to src/main/java/com/android/tools/r8/profile/startup/instrumentation/InstrumentationOptions.java
index 4a11409..69bc2d2 100644
--- a/src/main/java/com/android/tools/r8/profile/startup/instrumentation/StartupInstrumentationOptions.java
+++ b/src/main/java/com/android/tools/r8/profile/startup/instrumentation/InstrumentationOptions.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -11,7 +11,7 @@
import java.util.Collections;
import java.util.Set;
-public class StartupInstrumentationOptions {
+public class InstrumentationOptions {
/** Set of method references where all calls to the exact method reference should print. */
private Set<DexMethod> callSitesToInstrument = Collections.emptySet();
@@ -68,7 +68,7 @@
return startupInstrumentationServerSyntheticContext;
}
- public StartupInstrumentationOptions setStartupInstrumentationServerSyntheticContext(
+ public InstrumentationOptions setStartupInstrumentationServerSyntheticContext(
String startupInstrumentationServerSyntheticContext) {
this.startupInstrumentationServerSyntheticContext =
startupInstrumentationServerSyntheticContext;
@@ -83,8 +83,7 @@
return startupInstrumentationTag;
}
- public StartupInstrumentationOptions setStartupInstrumentationTag(
- String startupInstrumentationTag) {
+ public InstrumentationOptions setStartupInstrumentationTag(String startupInstrumentationTag) {
this.startupInstrumentationTag = startupInstrumentationTag;
return this;
}
@@ -93,7 +92,7 @@
return enableStartupInstrumentation;
}
- public StartupInstrumentationOptions setEnableStartupInstrumentation() {
+ public InstrumentationOptions setEnableStartupInstrumentation() {
enableStartupInstrumentation = true;
return this;
}
diff --git a/src/main/java/com/android/tools/r8/profile/startup/instrumentation/StartupInstrumentation.java b/src/main/java/com/android/tools/r8/profile/startup/instrumentation/StartupInstrumentation.java
index 521d784..96c4ca4 100644
--- a/src/main/java/com/android/tools/r8/profile/startup/instrumentation/StartupInstrumentation.java
+++ b/src/main/java/com/android/tools/r8/profile/startup/instrumentation/StartupInstrumentation.java
@@ -58,7 +58,7 @@
private final DexItemFactory dexItemFactory;
private final InternalOptions options;
private final StartupInstrumentationReferences references;
- private final StartupInstrumentationOptions startupInstrumentationOptions;
+ private final InstrumentationOptions startupInstrumentationOptions;
private StartupInstrumentation(AppView<AppInfo> appView) {
this.appView = appView;
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 23a0e46..15701b3 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -89,7 +89,7 @@
import com.android.tools.r8.position.Position;
import com.android.tools.r8.profile.art.ArtProfileOptions;
import com.android.tools.r8.profile.startup.StartupOptions;
-import com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentationOptions;
+import com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions;
import com.android.tools.r8.references.ClassReference;
import com.android.tools.r8.references.FieldReference;
import com.android.tools.r8.references.MethodReference;
@@ -946,8 +946,7 @@
private final MappingComposeOptions mappingComposeOptions = new MappingComposeOptions();
private final ArtProfileOptions artProfileOptions = new ArtProfileOptions(this);
private final StartupOptions startupOptions = new StartupOptions();
- private final StartupInstrumentationOptions startupInstrumentationOptions =
- new StartupInstrumentationOptions();
+ private final InstrumentationOptions startupInstrumentationOptions = new InstrumentationOptions();
public final TestingOptions testing = new TestingOptions();
public List<ProguardConfigurationRule> mainDexKeepRules = ImmutableList.of();
@@ -1043,7 +1042,7 @@
return startupOptions;
}
- public StartupInstrumentationOptions getStartupInstrumentationOptions() {
+ public InstrumentationOptions getStartupInstrumentationOptions() {
return startupInstrumentationOptions;
}
diff --git a/src/test/java/com/android/tools/r8/startup/utils/StartupTestingUtils.java b/src/test/java/com/android/tools/r8/startup/utils/StartupTestingUtils.java
index f51ab4b..42d09b1 100644
--- a/src/test/java/com/android/tools/r8/startup/utils/StartupTestingUtils.java
+++ b/src/test/java/com/android/tools/r8/startup/utils/StartupTestingUtils.java
@@ -23,7 +23,7 @@
import com.android.tools.r8.profile.art.ArtProfileBuilderUtils;
import com.android.tools.r8.profile.art.HumanReadableArtProfileParser;
import com.android.tools.r8.profile.art.HumanReadableArtProfileParserBuilder;
-import com.android.tools.r8.profile.startup.instrumentation.StartupInstrumentationOptions;
+import com.android.tools.r8.profile.startup.instrumentation.InstrumentationOptions;
import com.android.tools.r8.startup.StartupClassBuilder;
import com.android.tools.r8.startup.StartupMethodBuilder;
import com.android.tools.r8.startup.StartupProfileBuilder;
@@ -100,7 +100,7 @@
testBuilder
.addOptionsModification(
options -> {
- StartupInstrumentationOptions startupInstrumentationOptions =
+ InstrumentationOptions startupInstrumentationOptions =
options.getStartupInstrumentationOptions().setEnableStartupInstrumentation();
if (logcat) {
startupInstrumentationOptions.setStartupInstrumentationTag(
