Remove dex_tool param completely

Summary: Unused Reviewed By: hick209 Differential Revision: D66959853 fbshipit-source-id: cc6ddcc40d33b090e847b8f3a65f966426ae4e93
facebook · Dec 10, 2024 · 9d30891 · 9d30891
1 parent 3c63c4b
commit 9d30891
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/android/android.bzl b/android/android.bzl
@@ -108,7 +108,6 @@ extra_attributes = {
         "application_module_configs": attrs.dict(key = attrs.string(), value = attrs.list(attrs.transition_dep(cfg = cpu_transition)), sorted = False, default = {}),
         "build_config_values_file": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),
         "deps": attrs.list(attrs.split_transition_dep(cfg = cpu_split_transition), default = []),
-        "dex_tool": attrs.string(default = "d8"),  # Match default in V1
         "duplicate_resource_behavior": attrs.enum(DuplicateResourceBehaviour, default = "allow_by_default"),  # Match default in V1
         "manifest": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),
         "manifest_skeleton": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),
@@ -140,7 +139,6 @@ extra_attributes = {
         "application_module_configs": attrs.dict(key = attrs.string(), value = attrs.list(attrs.transition_dep(cfg = cpu_transition)), sorted = False, default = {}),
         "build_config_values_file": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),
         "deps": attrs.list(attrs.split_transition_dep(cfg = cpu_split_transition), default = []),
-        "dex_tool": attrs.string(default = "d8"),  # Match default in V1
         "duplicate_resource_behavior": attrs.enum(DuplicateResourceBehaviour, default = "allow_by_default"),  # Match default in V1
         "manifest": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),
         "manifest_skeleton": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),
@@ -165,7 +163,6 @@ extra_attributes = {
         "apk": attrs.dep(),
         "cpu_filters": attrs.list(attrs.enum(TargetCpuType), default = []),
         "deps": attrs.list(attrs.split_transition_dep(cfg = cpu_split_transition), default = []),
-        "dex_tool": attrs.string(default = "d8"),  # Match default in V1
         "is_self_instrumenting": attrs.bool(default = False),
         "manifest": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),
         "manifest_skeleton": attrs.option(attrs.one_of(attrs.transition_dep(cfg = cpu_transition), attrs.source()), default = None),

diff --git a/decls/android_rules.bzl b/decls/android_rules.bzl
@@ -210,7 +210,6 @@ android_binary = prelude_rule(
             "deps": attrs.list(attrs.dep(), default = []),
             "dex_compression": attrs.option(attrs.enum(DexStore), default = None),
             "dex_group_lib_limit": attrs.int(default = 0),
-            "dex_tool": attrs.string(default = ""),
             "disable_pre_dex": attrs.bool(default = False),
             "duplicate_resource_behavior": attrs.enum(DuplicateResourceBehaviour, default = "allow_by_default"),
             "duplicate_resource_whitelist": attrs.option(attrs.source(), default = None),
@@ -446,7 +445,6 @@ android_bundle = prelude_rule(
             "deps": attrs.list(attrs.dep(), default = []),
             "dex_compression": attrs.option(attrs.enum(DexStore), default = None),
             "dex_group_lib_limit": attrs.int(default = 0),
-            "dex_tool": attrs.string(default = ""),
             "disable_pre_dex": attrs.bool(default = False),
             "duplicate_resource_behavior": attrs.enum(DuplicateResourceBehaviour, default = "allow_by_default"),
             "duplicate_resource_whitelist": attrs.option(attrs.source(), default = None),
@@ -576,7 +574,6 @@ android_instrumentation_apk = prelude_rule(
             "aapt_mode": attrs.enum(AaptMode, default = "aapt1"),
             "contacts": attrs.list(attrs.string(), default = []),
             "default_host_platform": attrs.option(attrs.configuration_label(), default = None),
-            "dex_tool": attrs.string(default = ""),
             "disable_pre_dex": attrs.bool(default = False),
             "includes_vector_drawables": attrs.bool(default = False),
             "labels": attrs.list(attrs.string(), default = []),