summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Gillin <peteg@google.com>2019-06-04 16:10:01 +0100
committerPete Gillin <peteg@google.com>2019-06-04 16:53:40 +0100
commite151dd3ffd0ef8fb15cbf71cf390bea95e0e1bff (patch)
tree2afa932d9211cbbc478ec9b01085ddf84987e8e1
parentdc24638eee827f7a150dd7e6e6bdcea811f0cee8 (diff)
downloaddesugar-e151dd3ffd0ef8fb15cbf71cf390bea95e0e1bff.tar.gz
Revert "Fix annotation processors working w/ generated code on OpenJDK 9 toolchain"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13
This change is no longer needed, following http://r.android.com/943770 in April 2019, which upgraded external/dagger2 from a 2015 version of auto-common to version 0.10 (https://github.com/google/auto/releases/tag/auto-common-0.10). This auto-common version does not output code using javax.annotation.Generated if it is is not available, so the module that provides (java.xml.ws.annotation) it can be safely removed. This is beneficial since the module is deprecated in OpenJDK 9 and is removed in later versions. N.B. The change being reverted was to Android.mk, this removes the corresponding lines from the migrated Android.bp. This reverts commit 66b92c8c9172780c5794f47cbe7ede4eeee009b7. Bug: 62050818 Bug: 131683177 Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make droid Change-Id: Id964a685dbadb21f414b15e029d5e02a40ece83f
-rw-r--r--Android.bp5
1 files changed, 0 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 96e08ed..5db843c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,11 +22,6 @@ java_library_host {
"jsr305-3.0.1",
],
- openjdk9: {
- // Required for use of javax.annotation.Generated per http://b/62050818
- javacflags: ["-J--add-modules=java.xml.ws.annotation"],
- },
-
// Use Dagger2 annotation processor
plugins: ["dagger2-auto-value"],
libs: ["dagger2-auto-value"],