Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76773b6 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Build: Experimental option to default to -source 1.9 -target 1.9" am:... 

Merge "Build: Experimental option to default to -source 1.9 -target 1.9" am: 67352ffa am: 1e00ce0e am: a32ca520 am: 6fc54375
am: 63683f84

Change-Id: Ice8d4c8d43e4b93966477283865f7f94a5809950
parents b96f5adb 63683f84

core/java_common.mk

+5 −1
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) 
  ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_18_support)))

    LOCAL_JAVA_LANGUAGE_VERSION := 1.7

  else

    ifneq ($(EXPERIMENTAL_USE_OPENJDK9),true)

      LOCAL_JAVA_LANGUAGE_VERSION := 1.8

    else

      LOCAL_JAVA_LANGUAGE_VERSION := 1.9

    endif

  endif

endif

LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)