diff options
| author | Pete Gillin <peteg@google.com> | 2019-10-10 11:13:16 +0100 |
|---|---|---|
| committer | Pete Gillin <peteg@google.com> | 2019-10-11 18:27:49 +0100 |
| commit | 188dc7001ff5cac5e376925a00b1dae50af6de96 (patch) | |
| tree | 5304eaa216318e8a16d69211e9b7f7a1f4a457f5 | |
| parent | cb5c455ed10c87d7a8910e7b6a3694bc2b0d9c5b (diff) | |
| download | javaparser-188dc7001ff5cac5e376925a00b1dae50af6de96.tar.gz | |
Remove reference to java.xml.ws.annotation.
This is not needed any more, because the code was upgraded to a newer
version from upstream which migrated away from using
javax.annotation.Generated (see https://r.android.com/1099815). The
redundant --add-modules option breaks builds with -source 9 -target 9
(so the Java module system is enabled) using OpenJDK 11 (which removes
this module). In other words, the third of the 'Test' lines below
fails without this change and succeeds with it.
Test: make javaparser
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make javaparser
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN=true make javaparser
Test: . $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/runTest.sh (in downstream branch)
Bug: 131683177
Change-Id: Id0e6adcb4ba56b0d15f904891c5fda655953f4f3
| -rw-r--r-- | Android.bp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 22c10ca72..68567d967 100644 --- a/Android.bp +++ b/Android.bp @@ -23,7 +23,4 @@ java_library_host { "javaparser-core/src/main/javacc-support/**/*.java", "javaparser-core/generated-sources/**/*.java", ], - openjdk9: { - javacflags: ["--add-modules=java.xml.ws.annotation"], - } } |