Create separate DEX_DESUGAR minSdk constant for use by dexing and desugaring actions.

This won't necessarily increase along with depot_floor

PiperOrigin-RevId: 939956709
Change-Id: I785cc4603882bc1317767fb095193658156bbcd7

mobile_install/utils.bzl

diff --git a/mobile_install/utils.bzl b/mobile_install/utils.bzl
index 75a843e..1a8e16e 100644
--- a/mobile_install/utils.bzl
+++ b/mobile_install/utils.bzl
@@ -158,7 +158,7 @@
         deterministic manner.
       deps: The list of dependencies for the Jar being desugared.
     """
-    min_sdk = _min_sdk_version.get(ctx)
+    min_sdk = _min_sdk_version.DEX_DESUGAR
     args = ctx.actions.args()
     args.use_param_file(param_file_arg = "-flagfile=%s", use_always = True)
 

rules/dex_desugar_aspect.bzl

diff --git a/rules/dex_desugar_aspect.bzl b/rules/dex_desugar_aspect.bzl
index b154240..a54a1bb 100644
--- a/rules/dex_desugar_aspect.bzl
+++ b/rules/dex_desugar_aspect.bzl
@@ -100,7 +100,7 @@
 
     incremental_dexing = getattr(ctx.rule.attr, "incremental_dexing", _tristate.auto)
 
-    min_sdk_version = _min_sdk_version.get(ctx)
+    min_sdk_version = _min_sdk_version.DEX_DESUGAR
 
     if incremental_dexing == _tristate.no:
         return []

rules/min_sdk_version.bzl

diff --git a/rules/min_sdk_version.bzl b/rules/min_sdk_version.bzl
index 1f5e91b..a50f735 100644
--- a/rules/min_sdk_version.bzl
+++ b/rules/min_sdk_version.bzl
@@ -25,6 +25,7 @@
 
 _SETTING = "//rules/flags:min_sdk_version"
 _DEPOT_FLOOR = 23
+_DEX_DESUGAR = 23
 _MIN_SDK_LEVELS = sorted([_DEPOT_FLOOR, 24])
 
 _ATTRS = dict(
@@ -62,4 +63,5 @@
     clamp = _clamp,
     get = _get,
     DEPOT_FLOOR = _DEPOT_FLOOR,
+    DEX_DESUGAR = _DEX_DESUGAR,
 )

src/tools/java/com/google/devtools/build/android/r8/BUILD

diff --git a/src/tools/java/com/google/devtools/build/android/r8/BUILD b/src/tools/java/com/google/devtools/build/android/r8/BUILD
index 19b8a62..c6387b7 100644
--- a/src/tools/java/com/google/devtools/build/android/r8/BUILD
+++ b/src/tools/java/com/google/devtools/build/android/r8/BUILD
@@ -148,6 +148,6 @@
   private Constants() {}
 }
 EOF
-""" % str(min_sdk_version.DEPOT_FLOOR),
+""" % str(min_sdk_version.DEX_DESUGAR),
     visibility = [":__pkg__"],
 )

tools/android/BUILD

diff --git a/tools/android/BUILD b/tools/android/BUILD
index f9d6d94..e9983ff 100644
--- a/tools/android/BUILD
+++ b/tools/android/BUILD
@@ -131,7 +131,7 @@
     cmd = "$(location //src/tools/extract_desugar_pgcfg_flags) --input_json $(location :desugar_jdk_libs_json) --output_file $@",
 )
 
-_MIN_SDK_VERSION = str(min_sdk_version.DEPOT_FLOOR)
+_MIN_SDK_VERSION = str(min_sdk_version.DEX_DESUGAR)
 
 genrule(
     name = "build_java8_legacy_dex_params",
@@ -181,7 +181,7 @@
           "--desugar_supported_core_libs " +
           "--desugared_lib_config=$(location :full_desugar_jdk_libs_config_json) " +
           "--bootclasspath_entry=$(location :bootclasspath) " +
-          "--min_sdk_version=%d " % min_sdk_version.DEPOT_FLOOR +
+          "--min_sdk_version=%d " % min_sdk_version.DEX_DESUGAR +
           "--input=$(location :desugar_jdk_libs_all) --output=$@",
     tools = ["//src/tools/java/com/google/devtools/build/android/r8:core_library_desugar"],
 )
@@ -623,7 +623,7 @@
 genrule(
     name = "desugar_globals",
     outs = ["desugar.globals"],
-    cmd = "$(JAVA) -Dcom.android.tools.r8.disableLambdaMethodAnnotations -jar $(location :global_synthetics_generator_deploy.jar) --min-api {} --output $@".format(min_sdk_version.DEPOT_FLOOR),
+    cmd = "$(JAVA) -Dcom.android.tools.r8.disableLambdaMethodAnnotations -jar $(location :global_synthetics_generator_deploy.jar) --min-api {} --output $@".format(min_sdk_version.DEX_DESUGAR),
     toolchains = ["//tools/jdk:current_host_java_runtime"],
     tools = [":global_synthetics_generator_deploy.jar"],
     visibility = ["//visibility:public"],
@@ -644,7 +644,7 @@
 genrule(
     name = "desugar_globals_classes",
     outs = ["desugar_globals_classes.zip"],
-    cmd = "$(JAVA) -Dcom.android.tools.r8.disableLambdaMethodAnnotations -jar $(location :global_synthetics_generator_deploy.jar) --min-api {} --classfile --output $@".format(min_sdk_version.DEPOT_FLOOR),
+    cmd = "$(JAVA) -Dcom.android.tools.r8.disableLambdaMethodAnnotations -jar $(location :global_synthetics_generator_deploy.jar) --min-api {} --classfile --output $@".format(min_sdk_version.DEX_DESUGAR),
     toolchains = ["//tools/jdk:current_host_java_runtime"],
     tools = [":global_synthetics_generator_deploy.jar"],
     visibility = ["//visibility:public"],