Skip to content

Commit

Permalink
Short-circuit bazel intrinsic Android library desugaring
Browse files Browse the repository at this point in the history
This feature has never really worked, and there's no point to keeping the broken code around. We will fix forward in rules_android. We'll keep the desugar_java8_legacy_libs target for now to avoid breaking various things that may depend on it simply existing.

Related to bazelbuild/rules_android#122

PiperOrigin-RevId: 571135204
Change-Id: I8f191d5492ce8ee0c735e2a036f1d9013ac06914
  • Loading branch information
ted-xie authored and copybara-github committed Oct 5, 2023
1 parent 2390fae commit 85855fc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 663 deletions.
12 changes: 1 addition & 11 deletions tools/android/BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -233,18 +233,8 @@ filegroup(

genrule(
name = "desugar_java8_legacy_libs",
srcs = ["@android_tools//:desugar_jdk_libs.jar", "full_desugar_jdk_libs.json", ":android_jar"],
outs = ["desugared_java8_legacy_libs.jar"],
message = "Desugaring java8 legacy libs with the D8 desugarer",
cmd = (
"$(location //src/tools/android/java/com/google/devtools/build/android/r8:core_library_desugar)" +
" --input $(location @android_tools//:desugar_jdk_libs.jar)" +
" --output $@" +
" --bootclasspath_entry $(location :android_jar)" +
" --desugar_supported_core_libs" +
" --desugared_lib_config $(location full_desugar_jdk_libs.json)"
),
tools = ["//src/tools/android/java/com/google/devtools/build/android/r8:core_library_desugar"],
cmd = "echo > $@"
)

# No-one should depend on this but :desugared_java8_legacy_libs above
Expand Down
Loading

0 comments on commit 85855fc

Please sign in to comment.