From e151dd3ffd0ef8fb15cbf71cf390bea95e0e1bff Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Tue, 4 Jun 2019 16:10:01 +0100 Subject: Revert "Fix annotation processors working w/ generated code on OpenJDK 9 toolchain" 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 --- Android.bp | 5 ----- 1 file changed, 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"], -- cgit v1.2.3