diff options
| author |  kmb <kmb@google.com> | 2018-05-16 08:51:43 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-16 08:53:19 -0700 |
| commit | cd76c1f8a9a645f0ecc2a95a66548b7178b35155 (patch) | |
| tree | a2a82ab68616ec7ec5db0bd7292f536b7d33ae39 /src/tools/android/java/com/google/devtools/build | |
| parent | 35a78c09cf2fbfc3de9c124d2142e3d72aac4348 (diff) | |
Enable proguarded Android builds with --experimental_desugar_java8_libs in Bazel
RELNOTES: Bazel supports including select Java 8 APIs into Android apps targeting pre-Nougat Android devices with --experimental_desugar_java8_libs
PiperOrigin-RevId: 196833987
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build')
3 files changed, 19 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD b/src/tools/android/java/com/google/devtools/build/android/BUILD index e11eec0260..9bc293d136 100644 --- a/src/tools/android/java/com/google/devtools/build/android/BUILD +++ b/src/tools/android/java/com/google/devtools/build/android/BUILD @@ -8,6 +8,7 @@ filegroup( "BUILD.tools", ":all_android_tools_deploy.jar", "//src/tools/android/java/com/google/devtools/build/android/desugar:embedded_tools", + "//src/tools/android/java/com/google/devtools/build/android/desugar/scan:embedded_tools", "//src/tools/android/java/com/google/devtools/build/android/dexer:embedded_tools", "//src/tools/android/java/com/google/devtools/build/android/idlclass:embedded_tools", "//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:embedded_tools", @@ -23,6 +24,7 @@ java_binary( runtime_deps = [ ":android_builder_lib", "//src/tools/android/java/com/google/devtools/build/android/desugar", + "//src/tools/android/java/com/google/devtools/build/android/desugar/scan", "//src/tools/android/java/com/google/devtools/build/android/dexer:dexerdeps", "//src/tools/android/java/com/google/devtools/build/android/idlclass:idlclass_lib", "//src/tools/android/java/com/google/devtools/build/android/ziputils:ziputils_lib", diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/scan/BUILD b/src/tools/android/java/com/google/devtools/build/android/desugar/scan/BUILD index 3f0bf3c3c3..e128c510ad 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/scan/BUILD +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/scan/BUILD @@ -1,6 +1,14 @@ # Description: # Tools for scanning bytecode for references to other classes and emitting Proguard-style keeps. +filegroup( + name = "embedded_tools", + srcs = ["BUILD.tools"], + visibility = [ + "//src/tools/android/java/com/google/devtools/build/android:__pkg__", + ], +) + java_library( name = "scan", srcs = glob(["*.java"]), @@ -21,6 +29,7 @@ java_library( java_binary( name = "KeepScanner", + testonly = 1, # normally used through @bazel_tools main_class = "com.google.devtools.build.android.desugar.scan.KeepScanner", visibility = [ "//src/test/java/com/google/devtools/build/android/desugar/scan:__pkg__", diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/scan/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/desugar/scan/BUILD.tools new file mode 100644 index 0000000000..b6727f7cae --- /dev/null +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/scan/BUILD.tools @@ -0,0 +1,8 @@ +java_binary( + name = "KeepScanner", + main_class = "com.google.devtools.build.android.desugar.scan.KeepScanner", + runtime_deps = [ + "//src/tools/android/java/com/google/devtools/build/android:all_android_tools", + ], + visibility = ["@bazel_tools//tools/android:__pkg__"], +) |