diff options
author | Tobias Thierer <tobiast@google.com> | 2017-11-17 15:27:36 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-17 15:27:36 +0000 |
commit | b1654fa03e7f43425c74644ca73d860198344d30 (patch) | |
tree | 7fc1739b629882f3eb00adef3c1aa854f0998091 | |
parent | 8e3e13fad023131a7c21e348182d09cebccb750c (diff) | |
parent | 25ac929ce2fcb442552fee1aef2d146cec35362a (diff) | |
download | dagger2-pie-b4s4-release.tar.gz |
Merge "Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9" am: 8eeb4d589a am: aa6a6e2682android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 25ac929ce2
Change-Id: I5b546bf2874c6b60dfaa88c0a3ceee42c165a454
-rw-r--r-- | Android.mk | 2 |
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 |