Commit 2704f9c3 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Add javax.annotation.Generated as an explicit dep to jni_generator

This class exists in the default bootclasspath in JDK8, but not in
JDK 11. This dep makes the annotation processor work when used with
JDK 11's javac.

Bug: 693079
Change-Id: Ic5258aa0fd1b438d7ba0dd393f95b3a2b78d5c7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1882066
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709910}
parent 192ee160
...@@ -106,6 +106,7 @@ java_annotation_processor("jni_processor") { ...@@ -106,6 +106,7 @@ java_annotation_processor("jni_processor") {
deps = [ deps = [
"//base:jni_java", "//base:jni_java",
"//third_party/android_deps:com_squareup_javapoet_java", "//third_party/android_deps:com_squareup_javapoet_java",
"//third_party/android_deps:javax_annotation_jsr250_api_java",
"//third_party/auto:auto_service_java", "//third_party/auto:auto_service_java",
"//third_party/guava:guava_java", "//third_party/guava:guava_java",
] ]
......
...@@ -1075,6 +1075,13 @@ java_prebuilt("com_squareup_javapoet_java") { ...@@ -1075,6 +1075,13 @@ java_prebuilt("com_squareup_javapoet_java") {
output_name = "com_squareup_javapoet" output_name = "com_squareup_javapoet"
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("javax_annotation_jsr250_api_java") {
jar_path = "libs/javax_annotation_jsr250_api/jsr250-api-1.0.jar"
output_name = "javax_annotation_jsr250_api"
supports_android = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("javax_inject_javax_inject_java") { java_prebuilt("javax_inject_javax_inject_java") {
jar_path = "libs/javax_inject_javax_inject/javax.inject-1.jar" jar_path = "libs/javax_inject_javax_inject/javax.inject-1.jar"
...@@ -1791,16 +1798,6 @@ java_prebuilt("com_google_j2objc_j2objc_annotations_java") { ...@@ -1791,16 +1798,6 @@ java_prebuilt("com_google_j2objc_j2objc_annotations_java") {
visibility = [ ":*" ] visibility = [ ":*" ]
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("javax_annotation_jsr250_api_java") {
jar_path = "libs/javax_annotation_jsr250_api/jsr250-api-1.0.jar"
output_name = "javax_annotation_jsr250_api"
# To remove visibility constraint, add this dependency to
# //tools/android/roll/android_deps/build.gradle.
visibility = [ ":*" ]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("net_sf_kxml_kxml2_java") { java_prebuilt("net_sf_kxml_kxml2_java") {
jar_path = "libs/net_sf_kxml_kxml2/kxml2-2.3.0.jar" jar_path = "libs/net_sf_kxml_kxml2/kxml2-2.3.0.jar"
......
...@@ -114,6 +114,7 @@ dependencies { ...@@ -114,6 +114,7 @@ dependencies {
compile "com.android.support:multidex:1.0.0" compile "com.android.support:multidex:1.0.0"
buildCompile "javax.annotation:jsr250-api:1.0"
buildCompile "javax.inject:javax.inject:1" buildCompile "javax.inject:javax.inject:1"
// Dagger // Dagger
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment