diff options
author | Tobias Thierer <tobiast@google.com> | 2017-11-17 15:19:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-17 15:19:35 +0000 |
commit | 1c800fe10206aed2c6fab03fda8263841b585cc7 (patch) | |
tree | d3b49138cf248004d30ecc597685b2bedf9048f0 | |
parent | 6e6c481ab7de884ff5cbea6339465229e6f64f2f (diff) | |
parent | 06f9aaebb4d682b05f118fe1a60deb5abb6e0d2e (diff) | |
download | caliper-1c800fe10206aed2c6fab03fda8263841b585cc7.tar.gz |
Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9.android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
am: 06f9aaebb4
Change-Id: I40400d68170d9e62c1a0af3bb385e52743428fb6
-rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -25,7 +25,7 @@ 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_JAVACFLAGS := $(if $(USE_OPENJDK9),-J--add-modules=java.xml.ws.annotation) LOCAL_IS_HOST_MODULE := true LOCAL_STATIC_JAVA_LIBRARIES := \ @@ -81,7 +81,7 @@ 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_JAVACFLAGS := $(if $(USE_OPENJDK9),-J--add-modules=java.xml.ws.annotation,) LOCAL_IS_HOST_MODULE := true LOCAL_STATIC_JAVA_LIBRARIES := \ |