Skip to content

Commit 8dcb707

Browse files
aranguyencopybara-github
authored andcommitted
Delete --experimental_android_use_parallel_dex2oat
PiperOrigin-RevId: 893118281 Change-Id: Ie12570842d5d0ed50dc2998d958ac5fb7fa2b5b4
1 parent acdd9a7 commit 8dcb707

3 files changed

Lines changed: 0 additions & 23 deletions

File tree

src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -319,18 +319,6 @@ public static class Options extends FragmentOptions {
319319
+ "Values > 0 turn the feature on, values > 1 run that many dexbuilder shards.")
320320
public int incrementalDexingShardsAfterProguard;
321321

322-
@Option(
323-
name = "experimental_android_use_parallel_dex2oat",
324-
defaultValue = "false",
325-
documentationCategory = OptionDocumentationCategory.TESTING,
326-
effectTags = {
327-
OptionEffectTag.LOADING_AND_ANALYSIS,
328-
OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS
329-
},
330-
metadataTags = {OptionMetadataTag.EXPERIMENTAL},
331-
help = "Use dex2oat in parallel to possibly speed up android_test.")
332-
public boolean useParallelDex2Oat;
333-
334322
// Do not use on the command line.
335323
// This flag is intended to be updated as we add supported flags to the incremental dexing tools
336324
@Option(
@@ -820,7 +808,6 @@ public static class Options extends FragmentOptions {
820808
private final ApkSigningMethod apkSigningMethod;
821809
private final boolean compressJavaResources;
822810
private final boolean exportsManifestDefault;
823-
private final boolean useParallelDex2Oat;
824811
private final boolean fixedResourceNeverlinking;
825812
private final boolean persistentAarExtractor;
826813
private final boolean persistentBusyboxTools;
@@ -857,7 +844,6 @@ public AndroidConfiguration(BuildOptions buildOptions) throws InvalidConfigurati
857844
this.apkSigningMethod = options.apkSigningMethod;
858845
this.compressJavaResources = options.compressJavaResources;
859846
this.exportsManifestDefault = options.exportsManifestDefault;
860-
this.useParallelDex2Oat = options.useParallelDex2Oat;
861847
this.fixedResourceNeverlinking = options.fixedResourceNeverlinking;
862848
this.persistentAarExtractor = options.persistentAarExtractor;
863849
this.persistentBusyboxTools = options.persistentBusyboxTools;
@@ -994,11 +980,6 @@ public Boolean apkSigningMethodV4() {
994980
return apkSigningMethod.signV4();
995981
}
996982

997-
@Override
998-
public boolean useParallelDex2Oat() {
999-
return useParallelDex2Oat;
1000-
}
1001-
1002983
@Override
1003984
public boolean compressJavaResources() {
1004985
return compressJavaResources;

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidConfigurationApi.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ public interface AndroidConfigurationApi extends StarlarkValue {
121121
documented = false)
122122
boolean useAndroidResourceNameObfuscation();
123123

124-
@StarlarkMethod(name = "use_parallel_dex2oat", structField = true, doc = "", documented = false)
125-
boolean useParallelDex2Oat();
126-
127124
@StarlarkMethod(
128125
name = "compress_java_resources",
129126
structField = true,

src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ bazel_fragments["AndroidConfiguration.Options"] = fragment(
134134
"//command_line_option:experimental_android_resource_name_obfuscation",
135135
"//command_line_option:experimental_android_resource_path_shortening",
136136
"//command_line_option:experimental_android_resource_shrinking",
137-
"//command_line_option:experimental_android_use_parallel_dex2oat",
138137
"//command_line_option:experimental_get_android_java_resources_from_optimized_jar",
139138
"//command_line_option:experimental_persistent_aar_extractor",
140139
"//command_line_option:experimental_remove_r_classes_from_instrumentation_test_jar",

0 commit comments

Comments
 (0)