Revert "Revert "Allow java targets to support 1.8 source / target"" Reapply build changes for Java 8. Must be submitted with changes in development/build. This reverts commit 8db0d9724faf8e4ff0d2ced10b7ff479ed13fa77. Change-Id: Id2bef692997876c34f6c58b7b0512f4478da1985
diff --git a/core/java_common.mk b/core/java_common.mk index 5e0dfa0..08e5ee7 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)) @@ -267,6 +275,8 @@ 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, \