aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2017-05-26 12:14:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-26 12:14:30 +0000
commit0f9731749ee0cd647b76ddd6f1cf18c8499399bc (patch)
treebed06d89598ac22595db7b1b24a94a37625d9a21
parentf0fe1779c991fbc158c5d06d0c67accb7107d42b (diff)
parent55f01c365aae9197a2c6b08116bbdb6ca02b8733 (diff)
downloadcaliper-0f9731749ee0cd647b76ddd6f1cf18c8499399bc.tar.gz
Fix annotation processors working w/ generated code on OpenJDK 9 toolchain
am: 55f01c365a Change-Id: I34d349cb56a64f6928b2ad641315a21718973e56
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 8c5c5ee..baef6e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := $(call all-java-files-under, caliper/src/main/java/)
LOCAL_JAVA_RESOURCE_DIRS := caliper/src/main/resources
+# Required for use of javax.annotation.Generated per http://b/62050818
+LOCAL_JAVACFLAGS := $(if $(EXPERIMENTAL_USE_OPENJDK9),-J--add-modules=java.xml.ws.annotation)
LOCAL_IS_HOST_MODULE := true
LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -78,6 +80,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := $(call all-java-files-under, caliper/src/test/java/)
LOCAL_JAVA_RESOURCE_DIRS := caliper/src/test/resources
+# Required for use of javax.annotation.Generated per http://b/62050818
+LOCAL_JAVACFLAGS := $(if $(EXPERIMENTAL_USE_OPENJDK9),-J--add-modules=java.xml.ws.annotation,)
LOCAL_IS_HOST_MODULE := true
LOCAL_STATIC_JAVA_LIBRARIES := \