diff options
| author |  cushon <cushon@google.com> | 2017-05-06 12:15:25 -0400 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-05-08 09:48:58 -0400 |
| commit | 40d9cb30f9f1a9b94367036b42fabe9fcdfece2e (patch) | |
| tree | 6ca0286c2da79ad4e2d0e1d02e8b21e5a8c2b296 /tools | |
| parent | 90210fbae51f1a5dd3903a58b988689f30ef5106 (diff) | |
Allow android compilations to use type annotations
PiperOrigin-RevId: 155287620
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/BUILD.tools | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools index 8c7bc618a3..27da6a2706 100644 --- a/tools/android/BUILD.tools +++ b/tools/android/BUILD.tools @@ -49,21 +49,21 @@ alias( # if requested. filegroup( name = "desugar_java8_extra_bootclasspath", - srcs = ["java_lang_invoke.jar"], + srcs = ["java_lang_extras.jar"], visibility = ["//visibility:public"], ) -# javac needs this Jar to compile lambdas and method references. It contains -# java.lang.invoke.* which is not part of the android.jar. +# javac needs this Jar to compile lambdas, method references, and type annotations. +# These classes are not part of the android.jar. genrule( - name = "gen_java_lang_invoke_jar", + name = "gen_java_lang_extras_jar", srcs = [ "@local_jdk//:bootclasspath" ], tools = [ "@bazel_tools//tools/jdk:SingleJar_binary", ], - outs = ["java_lang_invoke.jar"], + outs = ["java_lang_extras.jar"], cmd = """ for jar in $(locations @local_jdk//:bootclasspath); do if [[ "$${jar}" == *"/rt.jar" ]]; then @@ -72,6 +72,7 @@ genrule( --dont_change_compression \ --sources $${jar} \ --include_prefixes "java/lang/invoke/" \ + --include_prefixes "java/lang/annotation/" \ --output $@ break fi @@ -80,8 +81,6 @@ genrule( visibility = ["//visibility:private"], ) - - alias( name = "IdlClass", actual = "//src/tools/android/java/com/google/devtools/build/android/idlclass:IdlClass", |