diff options
| author | Pete Gillin <peteg@google.com> | 2019-06-04 16:06:25 +0100 |
|---|---|---|
| committer | Pete Gillin <peteg@google.com> | 2019-06-04 16:54:34 +0100 |
| commit | 6d6b39bbc8fb84120c449838b68ed11d55ba2770 (patch) | |
| tree | 1f6a2675d2c8e8defc8f5a27a24b62ab5bc938d4 | |
| parent | e0063647591ebda813559d621ac634e162107cf8 (diff) | |
| download | caliper-6d6b39bbc8fb84120c449838b68ed11d55ba2770.tar.gz | |
Revert "Fix annotation processors working w/ generated code on OpenJDK 9 toolchain"android-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 55f01c365aae9197a2c6b08116bbdb6ca02b8733.
Bug: 62050818
Bug: 131683177
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make droid
Change-Id: I7fd3437c31d3a4ca93f9df8782eb843fa95841da
| -rw-r--r-- | Android.bp | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -20,8 +20,6 @@ java_library_host { srcs: ["caliper/src/main/java/**/*.java"], java_resource_dirs: ["caliper/src/main/resources"], - // Required for use of javax.annotation.Generated per http://b/62050818 - javacflags: ["-J--add-modules=java.xml.ws.annotation"], static_libs: [ "apache-commons-math", @@ -69,8 +67,6 @@ java_test_host { srcs: ["caliper/src/test/java/**/*.java"], java_resource_dirs: ["caliper/src/test/resources"], - // Required for use of javax.annotation.Generated per http://b/62050818 - javacflags: ["-J--add-modules=java.xml.ws.annotation"], static_libs: [ "caliper", |