commit 1c800fe10206aed2c6fab03fda8263841b585cc7
author Tobias Thierer <tobiast@google.com> Fri Nov 17 15:19:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 17 15:19:35 2017 +0000
tree d3b49138cf248004d30ecc597685b2bedf9048f0
parent 6e6c481ab7de884ff5cbea6339465229e6f64f2f
parent 06f9aaebb4d682b05f118fe1a60deb5abb6e0d2e

Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9.
am: 06f9aaebb4

Change-Id: I40400d68170d9e62c1a0af3bb385e52743428fb6

Android.mk

diff --git a/Android.mk b/Android.mk
index baef6e0..f07f534 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,7 @@
 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_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 := \