From 06f9aaebb4d682b05f118fe1a60deb5abb6e0d2e Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Wed, 15 Nov 2017 21:08:26 +0000 Subject: 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: Ibcd85c36a2fee78071ed382a81df0f9634e6ac8f --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index baef6e0..f07f534 100644 --- a/Android.mk +++ b/Android.mk @@ -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 := \ -- cgit v1.2.3