commit b1654fa03e7f43425c74644ca73d860198344d30
author Tobias Thierer <tobiast@google.com> Fri Nov 17 15:27:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 17 15:27:36 2017 +0000
tree 7fc1739b629882f3eb00adef3c1aa854f0998091
parent 8e3e13fad023131a7c21e348182d09cebccb750c
parent 25ac929ce2fcb442552fee1aef2d146cec35362a

Merge "Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9" am: 8eeb4d589a am: aa6a6e2682
am: 25ac929ce2

Change-Id: I5b546bf2874c6b60dfaa88c0a3ceee42c165a454

Android.mk

diff --git a/Android.mk b/Android.mk
index b648ca7..eebfea2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,7 +62,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 # 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_SRC_FILES := $(call all-java-files-under, compiler/src/main/java/)
 
 # Manually include META-INF/services/javax.annotation.processing.Processor