p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve merge conflicts of e82f56c4f7 to nyc-dev-plus-aosp 

Change-Id: I7b673e680240d0a597af971b6d903327875c4734
This commit is contained in:
Neil Fuller 2016-03-10 10:00:14 +00:00
parent 544bff0f3f e82f56c4f7
commit d7737f19c5
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/java_common.mk
View File

@ -3,11 +3,28 @@
########################################################### ###########################################################
## Java version ## Java version
########################################################### ###########################################################
# Use the LOCAL_JAVA_LANGUAGE_VERSION if it is set, otherwise
# use one based on the LOCAL_SDK_VERSION. If it is < 24
# pass "1.7" to the tools, if it is unset, >= 24 or "current"
# pass "1.8".
#
# The LOCAL_SDK_VERSION behavior is to ensure that, by default,
# code that is expected to run on older releases of Android
# does not use any 1.8 language features that are not supported
# on earlier runtimes (like default / static interface methods).
# Modules can override this logic by specifying
# LOCAL_JAVA_LANGUAGE_VERSION explicitly.
ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
ifeq (,$(LEGACY_USE_JAVA7)) private_sdk_versions_without_any_java_18_support := 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
LOCAL_JAVA_LANGUAGE_VERSION := 1.8 ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_18_support)))
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.7 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
else
# This retains 1.7 for ART build bots only. http://b/27583810
ifeq (,$(LEGACY_USE_JAVA7))
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
endif
endif endif
endif endif
LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION) LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)