aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2017-11-15 21:10:28 +0000
committerTobias Thierer <tobiast@google.com>2017-11-15 22:48:59 +0000
commit99405d701fdf61f631c9acefe9bc8bc66438db53 (patch)
tree7ed3b250c78dc96b6c28b86247622400a14a925d
parente5d08c40449250c30d1225ef107df7623aa5806f (diff)
downloaddagger2-99405d701fdf61f631c9acefe9bc8bc66438db53.tar.gz
Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9
This avoids duplicating the semantics of an unset/empty EXPERIMENTAL_USE_OPENJDK9. Test: make showcommands core-oj (in environments with EXPERIMENTAL_USE_OPENJDK9 set to "", "1.8", and "true"). Bug: 38177295 Change-Id: Ic7b9fdaf8574a1478b4382a399e0f3c4cbc5435a
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index b648ca7cc..eebfea255 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,7 +62,7 @@ LOCAL_MODULE := dagger2-compiler-host
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