aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2017-05-26 15:49:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-26 15:49:44 +0000
commit36eafd2643c07ff921d6913eb59ccd7039918ff9 (patch)
treebed06d89598ac22595db7b1b24a94a37625d9a21
parent28397e0a55eda5ec17d2a6b2bbed4c621a36434e (diff)
parent801853e1761de540a21c6cd5a3e0ab32e9b7cc73 (diff)
downloadcaliper-36eafd2643c07ff921d6913eb59ccd7039918ff9.tar.gz
Fix annotation processors working w/ generated code on OpenJDK 9 toolchain am: 55f01c365a am: 0f9731749e
am: 801853e176 Change-Id: I23269bb43cb081ee1ebab3d81de8906189e33770
-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 := \