StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow java targets to support 1.8 source / target

Browse Source 
This change enables build rules to specify:

LOCAL_JAVA_LANGUAGE_VERSION := 1.8

to enable -source 1.8 -target 1.8 for javac and
equivalent flags for Jack.

Bug: 26753820
Change-Id: I7991fafe4978485354663f091f4d78a0cc73ba26
This commit is contained in:
Neil Fuller
2016-01-15 19:41:26 -08:00
parent 0cfb04c60e
commit cdfbe4a852
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java_common.mk
View File

@@ -1,5 +1,13 @@
# 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
###########################################################
@@ -267,6 +275,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, \