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

Merge "Check LEGACY_USE_JAVA7 before using 1.8."

Browse Source 
am: 239783a7ff

* commit '239783a7ff9691ec92034f0268eeebbe75e906e3':
  Check LEGACY_USE_JAVA7 before using 1.8.
This commit is contained in:
Nicolas Geoffray
2016-02-29 12:29:31 +00:00
committed by android-build-merger
parent 8f9b8ddf00 239783a7ff
commit efe15f7429
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java_common.mk
View File

@@ -4,7 +4,11 @@
## Java version ## Java version
########################################################### ###########################################################
ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
LOCAL_JAVA_LANGUAGE_VERSION := 1.8 ifeq (,$(LEGACY_USE_JAVA7))
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
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)