commit 6c497e02a737a943486cf6d58e83c122c46eb321
author android-build-team Robot <android-build-team-robot@google.com> Sun Nov 19 08:32:43 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Nov 19 08:32:43 2017 +0000
tree d3b49138cf248004d30ecc597685b2bedf9048f0
parent 6e6c481ab7de884ff5cbea6339465229e6f64f2f
parent ab75cacdf76a3a519f4c53108a2576b6b2cf2f75

Snap for 4459973 from ab75cacdf76a3a519f4c53108a2576b6b2cf2f75 to pi-release

Change-Id: Ie7141a7f5f4feb49d28c8e0f52604cf4cf2d9cc1

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 := \