Automated rollback of commit f270005.

PiperOrigin-RevId: 723090006
Change-Id: Ida97e6ace3210ff07c5cf46e0a38ae1afe0c5a63

Author: ted-xie

rules/android_binary/attrs.bzl

@@ -213,6 +213,10 @@ ATTRS = _attrs.replace(
                     name = "optimizing_dexer",
                 ),
             ),
+            _desugared_lib_config = attr.label(
+                allow_single_file = True,
+                default = Label("//tools/android:full_desugar_jdk_libs_config_json"),
+            ),
             _desugared_java8_legacy_apis = attr.label(
                 default = Label("//tools/android:desugared_java8_legacy_apis"),
                 allow_single_file = True,

rules/android_binary/impl.bzl

@@ -487,6 +487,7 @@ def _process_deploy_jar(ctx, validation_ctx, stamp_ctx, packaged_resources_ctx,
                 bootclasspath = java_toolchain[java_common.JavaToolchainInfo].bootclasspath.to_list(),
                 min_sdk_version = _min_sdk_version.clamp(ctx.attr.min_sdk_version),
                 desugar_exec = get_android_toolchain(ctx).desugar.files_to_run,
+                desugared_lib_config = ctx.file._desugared_lib_config,
                 toolchain_type = ANDROID_TOOLCHAIN_TYPE,
             )
             desugared_jars.append(desugared_jar)

rules/desugar.bzl

@@ -26,6 +26,7 @@ def _desugar(
         min_sdk_version = 0,
         library_desugaring = True,
         desugar_exec = None,
+        desugared_lib_config = None,
         toolchain_type = None):
     """Desugars a JAR.
 
@@ -38,6 +39,8 @@ def _desugar(
         min_sdk_version: Integer. The minimum targeted sdk version.
         library_desugaring: Boolean. Whether to enable core library desugaring.
         desugar_exec: File. The executable desugar file.
+        desugared_lib_config: File. The json file containing desugarer options.
+        toolchain_type: Label or String. The toolchain to use for running the desugar action.
     """
 
     args = ctx.actions.args()
@@ -50,18 +53,24 @@ def _desugar(
     args.add_all(classpath, before_each = "--classpath_entry")
     args.add_all(bootclasspath, before_each = "--bootclasspath_entry")
 
+    input_file_deps = [input]
     if library_desugaring:
         if ctx.fragments.android.check_desugar_deps:
             args.add("--emit_dependency_metadata_as_needed")
 
-        if ctx.fragments.android.desugar_java8_libs and library_desugaring:
+        if ctx.fragments.android.desugar_java8_libs:
             args.add("--desugar_supported_core_libs")
+            args.add("--desugared_lib_config", desugared_lib_config)
+            if desugared_lib_config:
+                input_file_deps.append(desugared_lib_config)
+            else:
+                fail("Got NoneType for desugared_lib_config")
 
     if min_sdk_version > 0:
         args.add("--min_sdk_version", str(min_sdk_version))
 
     ctx.actions.run(
-        inputs = depset([input] + bootclasspath, transitive = [classpath]),
+        inputs = depset(input_file_deps + bootclasspath, transitive = [classpath]),
         outputs = [output],
         executable = desugar_exec,
         arguments = [args],

rules/dex_desugar_aspect.bzl

@@ -33,6 +33,7 @@ _ATTR_ASPECTS = [
     "_aspect_proto_toolchain_for_javalite",  # To get from proto_library through proto_lang_toolchain rule to proto runtime library.
     "_build_stamp_deps",  # for build stamp runtime class deps
     "_build_stamp_mergee_manifest_lib",  # for empty build stamp Service class implementation
+    "_desugared_lib_config",  # For java8 desugaring config file
     "_toolchain",  # For _java_lite_grpc_library
     "deps",
     "exports",
@@ -122,6 +123,7 @@ def _aspect_impl(target, ctx):
                     classpath = compiletime_classpath,
                     min_sdk_version = min_sdk_version,
                     desugar_exec = ctx.executable._desugar_java8,
+                    desugared_lib_config = ctx.file._desugared_lib_config,
                 )
             else:
                 desugared_jar = None
@@ -253,6 +255,10 @@ dex_desugar_aspect = aspect(
                 cfg = "exec",
                 executable = True,
             ),
+            "_desugared_lib_config": attr.label(
+                allow_single_file = True,
+                default = Label("//tools/android:full_desugar_jdk_libs_config_json"),
+            ),
             "_dexbuilder": attr.label(
                 default = Label("//tools/android:dexbuilder"),
                 allow_files = True,

tools/android/BUILD

@@ -86,6 +86,7 @@ genrule(
     cmd = "unzip -q -c " +
           "$(location @rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration_nio) " +
           "META-INF/desugar/d8/desugar.json > $@",
+    visibility = ["//visibility:public"],
 )
 
 genrule(
@@ -108,6 +109,7 @@ genrule(
     }),
     outs = ["desugar_jdk_libs.json"],
     cmd = "cp $< $@",
+    visibility = ["//visibility:public"],
 )
 
 genrule(
@@ -175,13 +177,22 @@ genrule(
     visibility = ["//visibility:public"],
 )
 
+_MIN_SDK_VERSION = "19"
+
 genrule(
     name = "d8_desugar_params",
     outs = ["d8_desugar_params.txt"],
-    cmd = "echo -n --min_sdk_version 19 > $@",
+    cmd = "echo -n --min_sdk_version " + _MIN_SDK_VERSION + " > $@",
     visibility = ["//visibility:private"],
 )
 
+genrule(
+    name = "desugar_min_sdk_version_txt",
+    outs = ["desugar_min_sdk_version.txt"],
+    cmd = "echo -n " + _MIN_SDK_VERSION + " > $@",
+    visibility = ["//visibility:public"],
+)
+
 sh_binary(
     name = "desugar_java8",
     srcs = [":d8_desugar.sh"],