diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/BUILD | 10 | ||||
| -rw-r--r-- | tools/jdk/BUILD | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tools/android/BUILD b/tools/android/BUILD index cb8148a..7a85b59 100644 --- a/tools/android/BUILD +++ b/tools/android/BUILD @@ -30,3 +30,13 @@ java_binary( visibility = ["//visibility:public"], runtime_deps = ["@rules_android_maven//:com_android_tools_build_bundletool"], ) + +java_plugin( + name = "compiler_annotation_processor", + generates_api = True, + processor_class = "android.databinding.annotationprocessor.ProcessDataBinding", + visibility = ["//visibility:public"], + deps = [ + "@bazel_tools//src/tools/android/java/com/google/devtools/build/android:all_android_tools", + ], +) diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index d83484b..76b1921 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -1,12 +1,9 @@ load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain") -default_java_toolchain( +# AOSP-only change +alias( name = "toolchain_android_only", - bootclasspath = [ - "//tools/android:android_jar", - # TODO(b/175805830): Add this only when desugaring is enabled. - "@bazel_tools//tools/android:desugar_java8_extra_bootclasspath", - ], + actual = "@bazel_tools//tools/jdk:current_java_toolchain", visibility = ["//visibility:public"], ) |