Building java8_legacy_dex works

.gitignore

@@ -3,3 +3,4 @@ bazel-*
 .ijwb
 # Android Studio Bazel Plugin
 .aswb
+*.swp

defs.bzl

@@ -40,6 +40,9 @@ def rules_android_workspace():
             "androidx.test.ext:junit:1.2.0-alpha01",
             "com.android.tools.build:apksig:8.3.0-alpha18",
             "com.android.tools.build:bundletool:1.15.5",
+            "com.android.tools:desugar_jdk_libs_minimal:2.0.4",
+            "com.android.tools:desugar_jdk_libs_configuration_minimal:2.0.4",
+            "com.android.tools:desugar_jdk_libs_nio:2.0.4",
             "com.android.tools:desugar_jdk_libs_configuration_nio:2.0.4",
             "com.android.tools.build:gradle:8.2.0-alpha15",
             "org.bouncycastle:bcprov-jdk18on:1.77",

examples/basicapp/.bazelrc

@@ -1,8 +1,9 @@
 # Flags needed while the Android rules are being migrated to Starlark.
 common --experimental_google_legacy_api
 common --experimental_enable_android_migration_apis
+common:core_library_desugaring --desugar_java8_libs
 
 # Flags to enable mobile-install v3
 mobile-install --mode=skylark --mobile_install_aspect=@rules_android//mobile_install:mi.bzl --mobile_install_supported_rules=android_binary
 # Required to invoke the Studio deployer jar
-mobile-install --tool_java_runtime_version=17
+mobile-install --tool_java_runtime_version=17

examples/basicapp/MODULE.bazel

@@ -5,6 +5,9 @@ module(
 bazel_dep(name = "rules_java", version = "7.4.0")
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 
+remote_android_extensions = use_extension("@bazel_tools//tools/android:android_extensions.bzl", "remote_android_tools_extensions")
+use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
+
 bazel_dep(
     name = "rules_android",
     version = "0.2.0",
@@ -18,4 +21,4 @@ local_path_override(
 register_toolchains(
     "@rules_android//toolchains/android:android_default_toolchain",
     "@rules_android//toolchains/android_sdk:android_sdk_tools",
-)
+)

rules_android_maven_install.json

@@ -1,8 +1,8 @@
 {
     "dependency_tree": {
         "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-        "__INPUT_ARTIFACTS_HASH": 1385768966,
-        "__RESOLVED_ARTIFACTS_HASH": -1912752840,
+        "__INPUT_ARTIFACTS_HASH": -164041937,
+        "__RESOLVED_ARTIFACTS_HASH": -1199898014,
         "conflict_resolution": {
             "com.google.protobuf:protobuf-java-util:3.9.2": "com.google.protobuf:protobuf-java-util:3.19.3"
         },
@@ -1534,6 +1534,18 @@
                 "sha256": "07908408e25f78dd13bfd59f01c3222713f73017ca81dacb662923f03e703f29",
                 "url": "https://maven.google.com/com/android/tools/common/31.2.0-alpha15/common-31.2.0-alpha15.jar"
             },
+            {
+                "coord": "com.android.tools:desugar_jdk_libs_configuration_minimal:2.0.4",
+                "dependencies": [],
+                "directDependencies": [],
+                "file": "v1/https/maven.google.com/com/android/tools/desugar_jdk_libs_configuration_minimal/2.0.4/desugar_jdk_libs_configuration_minimal-2.0.4.jar",
+                "mirror_urls": [
+                    "https://maven.google.com/com/android/tools/desugar_jdk_libs_configuration_minimal/2.0.4/desugar_jdk_libs_configuration_minimal-2.0.4.jar",
+                    "https://repo1.maven.org/maven2/com/android/tools/desugar_jdk_libs_configuration_minimal/2.0.4/desugar_jdk_libs_configuration_minimal-2.0.4.jar"
+                ],
+                "sha256": "3cdda0056c3039ab9c0aef7f19c10298f6a56407476b59b03055c42a222b71b7",
+                "url": "https://maven.google.com/com/android/tools/desugar_jdk_libs_configuration_minimal/2.0.4/desugar_jdk_libs_configuration_minimal-2.0.4.jar"
+            },
             {
                 "coord": "com.android.tools:desugar_jdk_libs_configuration_nio:2.0.4",
                 "dependencies": [],
@@ -1546,6 +1558,38 @@
                 "sha256": "32d68079c34ec46695eb7af4e4daf20e67f21392e4ae501d0fd3c7fe3406c893",
                 "url": "https://maven.google.com/com/android/tools/desugar_jdk_libs_configuration_nio/2.0.4/desugar_jdk_libs_configuration_nio-2.0.4.jar"
             },
+            {
+                "coord": "com.android.tools:desugar_jdk_libs_minimal:2.0.4",
+                "dependencies": [
+                    "com.android.tools:desugar_jdk_libs_configuration_minimal:2.0.4"
+                ],
+                "directDependencies": [
+                    "com.android.tools:desugar_jdk_libs_configuration_minimal:2.0.4"
+                ],
+                "file": "v1/https/maven.google.com/com/android/tools/desugar_jdk_libs_minimal/2.0.4/desugar_jdk_libs_minimal-2.0.4.jar",
+                "mirror_urls": [
+                    "https://maven.google.com/com/android/tools/desugar_jdk_libs_minimal/2.0.4/desugar_jdk_libs_minimal-2.0.4.jar",
+                    "https://repo1.maven.org/maven2/com/android/tools/desugar_jdk_libs_minimal/2.0.4/desugar_jdk_libs_minimal-2.0.4.jar"
+                ],
+                "sha256": "3bf4004c745f4c3740eea4c5729766b27746236f095c0fc52870e861183cbb9c",
+                "url": "https://maven.google.com/com/android/tools/desugar_jdk_libs_minimal/2.0.4/desugar_jdk_libs_minimal-2.0.4.jar"
+            },
+            {
+                "coord": "com.android.tools:desugar_jdk_libs_nio:2.0.4",
+                "dependencies": [
+                    "com.android.tools:desugar_jdk_libs_configuration_nio:2.0.4"
+                ],
+                "directDependencies": [
+                    "com.android.tools:desugar_jdk_libs_configuration_nio:2.0.4"
+                ],
+                "file": "v1/https/maven.google.com/com/android/tools/desugar_jdk_libs_nio/2.0.4/desugar_jdk_libs_nio-2.0.4.jar",
+                "mirror_urls": [
+                    "https://maven.google.com/com/android/tools/desugar_jdk_libs_nio/2.0.4/desugar_jdk_libs_nio-2.0.4.jar",
+                    "https://repo1.maven.org/maven2/com/android/tools/desugar_jdk_libs_nio/2.0.4/desugar_jdk_libs_nio-2.0.4.jar"
+                ],
+                "sha256": "3bf4004c745f4c3740eea4c5729766b27746236f095c0fc52870e861183cbb9c",
+                "url": "https://maven.google.com/com/android/tools/desugar_jdk_libs_nio/2.0.4/desugar_jdk_libs_nio-2.0.4.jar"
+            },
             {
                 "coord": "com.android.tools:dvlib:31.2.0-alpha15",
                 "dependencies": [

toolchains/android/toolchain.bzl

@@ -280,11 +280,11 @@ _ATTRS = dict(
     java8_legacy_dex = attr.label(
         allow_single_file = True,
         cfg = "exec",
-        default = "@bazel_tools//tools/android:java8_legacy_dex",
+        default = Label("//tools/android:java8_legacy_dex"),
     ),
     build_java8_legacy_dex = attr.label(
         cfg = "exec",
-        default = "@bazel_tools//tools/android:build_java8_legacy_dex",
+        default = Label("//tools/android:build_java8_legacy_dex"),
         executable = True,
     ),
     dex_list_obfuscator = attr.label(

tools/android/BUILD

@@ -1,5 +1,19 @@
 load(":defs.bzl", "android_jar")
 
+config_setting(
+    name = "minimal_desugaring",
+    values = {
+        "define": "java8_library_desugaring=minimal",
+    }
+)
+
+config_setting(
+    name = "full_desugaring",
+    values = {
+        "define": "java8_library_desugaring=full",
+    }
+)
+
 android_jar(
     name = "android_jar",
     visibility = ["//visibility:public"],
@@ -48,6 +62,12 @@ java_plugin(
     ],
 )
 
+alias(
+    name = "zip",
+    actual = "//toolchains/android:zip",
+    visibility = ["//visibility:public"],
+)
+
 genrule(
     name = "full_desugar_jdk_libs_config_json",
     outs = ["full_desugar_jdk_libs_config.json"],
@@ -59,25 +79,106 @@ genrule(
           "META-INF/desugar/d8/desugar.json > $@",
 )
 
+genrule(
+    name = "minimal_desugar_jdk_libs_config_json",
+    outs = ["minimal_desugar_jdk_libs_config.json"],
+    srcs = [
+        "@rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration_minimal",
+    ],
+    cmd = "unzip -q -c " +
+          "$(location @rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration_minimal) " +
+          "META-INF/desugar/d8/desugar.json > $@",
+)
+
+genrule(
+    name = "desugar_jdk_libs_json",
+    srcs = select({
+        "full_desugaring": [":full_desugar_jdk_libs_config_json"],
+        "minimal_desugaring": [":minimal_desugar_jdk_libs_config_json"],
+        "//conditions:default": [":full_desugar_jdk_libs_config_json"],
+    }),
+    outs = ["desugar_jdk_libs.json"],
+    cmd = "cp $< $@",
+)
+
 genrule(
     name = "minify_desugar_jdk_libs_pgcfg",
     outs = ["minify_desugar_jdk_libs.pgcfg"],
     srcs = [
         "//src/tools/extract_desugar_pgcfg_flags",
-        ":full_desugar_jdk_libs_config_json",
+        ":desugar_jdk_libs_json",
     ],
-    cmd = "$(location //src/tools/extract_desugar_pgcfg_flags) --input_json $(location :full_desugar_jdk_libs_config_json) --output_file $@"
+    cmd = "$(location //src/tools/extract_desugar_pgcfg_flags) --input_json $(location :desugar_jdk_libs_json) --output_file $@"
 )
 
-alias(
+genrule(
+    name = "build_java8_legacy_dex_params",
+    outs = ["build_java8_legacy_dex_params.txt"],
+    cmd = "echo -n --min-api 19 > $@",
+    visibility = ["//visibility:private"],
+)
+
+genrule(
+    name = "desugared_jdk_libs_from_maven_jar",
+    outs = ["desugared_jdk_libs_from_maven.jar"],
+    srcs = select({
+        "full_desugaring": ["@rules_android_maven//:com_android_tools_desugar_jdk_libs_nio"],
+        "minimal_desugaring": ["@rules_android_maven//:com_android_tools_desugar_jdk_libs_minimal"],
+        "//conditions:default": ["@rules_android_maven//:com_android_tools_desugar_jdk_libs_nio"],
+    }),
+    cmd = "cp $< $@",
+)
+
+genrule(
+    name = "desugared_jdk_libs_jar",
+    outs = ["desugared_jdk_libs.jar"],
+    srcs = [":desugared_jdk_libs_from_maven.jar", ":full_desugar_jdk_libs_config_json"],
+    tools = [":desugar_java8"],
+    cmd = "$(location :desugar_java8) " +
+          "--desugared_lib_config $(location :full_desugar_jdk_libs_config_json) " +
+          "--input=$(location :desugared_jdk_libs_from_maven.jar) --output=$@",
+)
+
+sh_binary(
+    name = "build_java8_legacy_dex",
+    srcs = ["build_java8_legacy_dex.sh"],
+    data = [
+        "build_java8_legacy_dex_params",
+        ":minify_desugar_jdk_libs.pgcfg",
+        ":desugared_jdk_libs_jar",
+        ":d8",
+        ":r8",
+        ":tracereferences",
+        ":zip",
+        "@bazel_tools//tools/bash/runfiles",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+genrule(
     name = "java8_legacy_dex",
-    actual = ":gen_fail",
+    outs = ["java8_legacy.dex.zip"],
+    cmd = "$(location :build_java8_legacy_dex) --output $@",
+    tools = [":build_java8_legacy_dex"],
     visibility = ["//visibility:public"],
 )
 
-alias(
+genrule(
+    name = "d8_desugar_params",
+    outs = ["d8_desugar_params.txt"],
+    cmd = "echo -n --min_sdk_version 19 > $@",
+    visibility = ["//visibility:private"],
+)
+
+sh_binary(
     name = "desugar_java8",
-    actual = "@bazel_tools//tools/android:desugar_java8",
+    srcs = [":d8_desugar.sh"],
+    data = [
+        ":d8_desugar_params",
+        "@bazel_tools//src/tools/android/java/com/google/devtools/build/android/r8:desugar",
+        ":full_desugar_jdk_libs_config_json",
+        "@bazel_tools//tools/bash/runfiles",
+    ],
     visibility = ["//visibility:public"],
 )
 
@@ -101,6 +202,13 @@ java_binary(
     runtime_deps = ["@android_gmaven_r8//jar"],
 )
 
+java_binary(
+    name = "tracereferences",
+    main_class = "com.android.tools.r8.tracereferences.TraceReferences",
+    visibility = ["//visibility:public"],
+    runtime_deps = ["@android_gmaven_r8//jar"],
+)
+
 java_binary(
     name = "resource_shrinker",
     main_class = "com.android.build.shrinker.ResourceShrinkerCli",