diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-11-15 21:08:26 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-11-15 22:49:17 +0000 |
| commit | 06f9aaebb4d682b05f118fe1a60deb5abb6e0d2e (patch) | |
| tree | d3b49138cf248004d30ecc597685b2bedf9048f0 | |
| parent | 6e6c481ab7de884ff5cbea6339465229e6f64f2f (diff) | |
| download | caliper-06f9aaebb4d682b05f118fe1a60deb5abb6e0d2e.tar.gz | |
Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9.android-o-mr1-iot-preview-6o-mr1-iot-preview-6
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
| -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 := \ |