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

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

Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." am: c6465f5d 

am: 719728f6

Change-Id: I3c1b93a2204d3b14c69afb4e7e051fecedd2e1ee
parents ec5aacff 719728f6

core/java_common.mk

+6 −1
Original line number Diff line number Diff line
@@ -21,11 +21,16 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) 
  else

    ifneq ($(EXPERIMENTAL_USE_OPENJDK9),true)

      LOCAL_JAVA_LANGUAGE_VERSION := 1.8

    else

      private_sdk_versions_without_any_java_19_support := 24 25 26

      ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_19_support)))

        LOCAL_JAVA_LANGUAGE_VERSION := 1.8

      else

        LOCAL_JAVA_LANGUAGE_VERSION := 1.9

      endif

    endif

  endif

endif

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



###########################################################