diff options
| author | Neil Fuller <nfuller@google.com> | 2016-02-09 23:01:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-09 23:01:40 +0000 |
| commit | dcd446e1e9c5329edb4ebb7d1042e54fa7b4bdb0 (patch) | |
| tree | 573e3864891ae44e74ee7612e11b939c23aec29a | |
| parent | 8c4f25f12fe0fe8265fb8849cf7cb2fc482ae7e5 (diff) | |
| parent | 2428bfeb88376de6e0d2487040d9abdfe690e8b3 (diff) | |
| download | build-dcd446e1e9c5329edb4ebb7d1042e54fa7b4bdb0.tar.gz | |
Merge "Allow java targets to support 1.8 source / target"
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/combo/javac.mk | 2 | ||||
| -rw-r--r-- | core/java_common.mk | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index b64b53b657..0267321ca9 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -340,6 +340,7 @@ LOCAL_CLANG_32:= LOCAL_CLANG_64:= LOCAL_INIT_RC_32:= LOCAL_INIT_RC_64:= +LOCAL_JAVA_LANGUAGE_VERSION:= # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. diff --git a/core/combo/javac.mk b/core/combo/javac.mk index 70dae13023..7f66ea83a9 100644 --- a/core/combo/javac.mk +++ b/core/combo/javac.mk @@ -14,7 +14,7 @@ ifndef ANDROID_COMPILE_WITH_JACK ANDROID_COMPILE_WITH_JACK := true endif -common_jdk_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999 +common_jdk_flags := -Xmaxerrs 9999999 # Use the indexer wrapper to index the codebase instead of the javac compiler ifeq ($(ALTERNATE_JAVAC),) diff --git a/core/java_common.mk b/core/java_common.mk index aee31932bd..34c67dc3b6 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -1,6 +1,14 @@ # Common to host and target Java modules. ########################################################### +## Java version +########################################################### +ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) + LOCAL_JAVA_LANGUAGE_VERSION := 1.7 +endif +LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION) + +########################################################### ## .proto files: Compile proto files to .java ########################################################### proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES)) @@ -265,6 +273,8 @@ ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ ifdef LOCAL_JACK_ENABLED ifdef need_compile_java +LOCAL_JACK_FLAGS += -D jack.java.source.version=$(LOCAL_JAVA_LANGUAGE_VERSION) + full_static_jack_libs := \ $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \ $(call intermediates-dir-for, \ |