diff options
| author | Neil Fuller <nfuller@google.com> | 2016-02-23 16:55:13 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-02-24 11:52:22 +0000 |
| commit | 2165a54784a99016ace8ffef7e17253d6841e6b4 (patch) | |
| tree | 88eff9d3edf9931b1d44b0695f6d1fd35abb17eb | |
| parent | f18823a974f84d583b620f7e48ab0b103f818e3b (diff) | |
| download | caliper-2165a54784a99016ace8ffef7e17253d6841e6b4.tar.gz | |
Pin libraries needed by vogar tool to java 1.7android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
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 needed by vogar to 1.7.
Bug: 26753820
Bug: 27310428
(cherry picked from commit 6a66412ab9c544ca7e099f81e764d2c01671ea70)
Change-Id: I0788ba7636f7cb6ab75f4efd42ed21a3a00a39e8
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -46,6 +46,7 @@ PROCESSOR_LIBRARIES := $(DAGGER2_PROCESSOR_LIBRARIES) PROCESSOR_CLASSES := $(DAGGER2_PROCESSOR_CLASSES) include external/dagger2/java_annotation_processors.mk +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) # Remember the location of the generated files, this is needed for when @@ -68,6 +69,7 @@ LOCAL_SRC_FILES := \ caliper/src/main/java/com/google/caliper/All.java \ caliper/src/main/java/com/google/caliper/Benchmark.java +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_JAVA_LIBRARY) # build caliper tests @@ -96,6 +98,7 @@ PROCESSOR_LIBRARIES := $(DAGGER2_PROCESSOR_LIBRARIES) PROCESSOR_CLASSES := $(DAGGER2_PROCESSOR_CLASSES) include external/dagger2/java_annotation_processors.mk +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) # build caliper examples @@ -114,6 +117,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ junit \ mockito-host +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) # Build host dependencies. |