diff options
| author | Ted Xie <tedx@google.com> | 2023-10-06 07:05:32 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-10-06 07:06:04 -0700 |
| commit | 5f969078a26aa472638b0c16f6c0e747dbb560f4 (patch) | |
| tree | 2782421cd15c980ca766cfe0c955bed626015cb1 | |
| parent | 1e66713b64fec18cee3609a058f6ccdf2a4c676a (diff) | |
| download | bazelbuild-rules_android-5f969078a26aa472638b0c16f6c0e747dbb560f4.tar.gz | |
Misc tool mapping fixes
* Replace usage of @androidsdk//:fail with //tools/android:gen_fail to satisfy allow_single_file for certain tools
* Add //tools/android:d8 java_binary target
* Correctly use d8 instead of r8 wrapper where applicable
* Set //tools/android:{desugared_java8_legacy_apis,java8_legacy_dex} to fail
* Make //tools/android:gen_fail publicly visible.
Part of #12
PiperOrigin-RevId: 571327927
Change-Id: I0773b5942e630b948d849d205119dab5f6a06787
| -rw-r--r-- | mobile_install/tools.bzl | 8 | ||||
| -rw-r--r-- | tools/android/BUILD | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/mobile_install/tools.bzl b/mobile_install/tools.bzl index 5086779..70c49c5 100644 --- a/mobile_install/tools.bzl +++ b/mobile_install/tools.bzl @@ -26,7 +26,7 @@ TOOL_ATTRS = dict( # use dummy libs. _android_sdk = attr.label( default = Label( - "@androidsdk//:sdk", + "//tools/android:android_jar", ), allow_files = True, cfg = "target", @@ -37,14 +37,14 @@ TOOL_ATTRS = dict( ), ), _studio_deployer = attr.label( - default = "@androidsdk//:fail", # TODO(#119): Studio deployer jar to be released + default = "//tools/android:gen_fail", # TODO(#119): Studio deployer jar to be released allow_single_file = True, cfg = "exec", executable = True, ), _mi_shell_dummy_native_libs = attr.label( default = Label( - "@androidsdk//:fail", # FIXME: Unused internally + "//tools/android:gen_fail", # FIXME: Unused internally ), allow_single_file = True, cfg = "target", @@ -91,7 +91,7 @@ TOOL_ATTRS = dict( executable = True, ), _d8 = attr.label( - default = Label("@bazel_tools//src/tools/android/java/com/google/devtools/build/android/r8:r8"), + default = Label("//tools/android:d8"), allow_files = True, cfg = "exec", executable = True, diff --git a/tools/android/BUILD b/tools/android/BUILD index 922e7e3..2d323aa 100644 --- a/tools/android/BUILD +++ b/tools/android/BUILD @@ -17,6 +17,7 @@ genrule( outs = ["fail.sh"], cmd = "echo 'exit 1' > $@", executable = 1, + visibility = ["//visibility:public"], ) sh_binary( @@ -43,7 +44,7 @@ java_plugin( alias( name = "java8_legacy_dex", - actual = "@bazel_tools//tools/android:java8_legacy_dex", + actual = ":gen_fail", visibility = ["//visibility:public"], ) @@ -55,11 +56,19 @@ alias( alias( name = "desugared_java8_legacy_apis", - actual = "@bazel_tools//tools/android:desugared_java8_legacy_apis", + actual = ":gen_fail", # TODO(#122): Fix library desugaring visibility = ["//visibility:public"], ) java_binary( + name = "d8", + main_class = "com.android.tools.r8.D8", + visibility = ["//visibility:public"], + runtime_deps = ["@android_gmaven_r8//jar"], +) + + +java_binary( name = "r8", main_class = "com.android.tools.r8.R8", visibility = ["//visibility:public"], |