diff options
| author | Neil Fuller <nfuller@google.com> | 2016-02-23 16:59:20 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-02-24 11:53:59 +0000 |
| commit | a68632a424c504551bb16ca8dcc5ebad2945491c (patch) | |
| tree | 2750b80f5a5a08dd0fb370d4ffd9a5a8025ce6de | |
| parent | 0678a34f05bbbcee7b16a29fa8aefae91e5bf359 (diff) | |
| download | dagger2-a68632a424c504551bb16ca8dcc5ebad2945491c.tar.gz | |
Pin libraries needed by vogar tool to java 1.7android-n-preview-2android-n-preview-1
vogar still uses javac/dx by default. dx does not
handle v52 class files. The default java version
is going to switch to 1.8. This change pins the
targets need by vogar to 1.7.
Bug: 26753820
Bug: 27310428
(cherry picked from commit 07bcdbf2e0a9ce721565b536de34ec11aaf614e7)
Change-Id: Ia197ad529f55308f424072babcd8b338890c72e6
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index cc57c5fc8..21fa4c1dd 100644 --- a/Android.mk +++ b/Android.mk @@ -28,6 +28,7 @@ LOCAL_JAVA_LIBRARIES := \ dagger2-inject-host \ guavalib +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) # build dagger2 producers host jar @@ -45,6 +46,7 @@ LOCAL_JAVA_LIBRARIES := \ dagger2-inject-host \ guavalib +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) # build dagger2 compiler host jar @@ -90,6 +92,7 @@ PROCESSOR_CLASSES := \ include $(LOCAL_PATH)/java_annotation_processors.mk +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) # Build host dependencies. |