From 99405d701fdf61f631c9acefe9bc8bc66438db53 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Wed, 15 Nov 2017 21:10:28 +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: Ic7b9fdaf8574a1478b4382a399e0f3c4cbc5435a
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index b648ca7c..eebfea25 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
-- 
cgit v1.2.3