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

Commit 7a70db72 authored by Colin Cross's avatar Colin Cross Committed by Martin Stjernholm
Browse files

Always default to 1.9 for host java modules in Android.mk files 

Host modules shouldn't use the logic for device modules to determine
the java language version to use, always default to 1.9.

Cherry-pick from https://r.android.com/1892956 - this may be necessary
in sc-mainline-prod when it switches to prebuilt SDKs (b/204189791).

Bug: 202761304
Test: presubmits
Change-Id: I268dd34d887db4646e188858c7f2aedc30966856
Merged-In: I268dd34d887db4646e188858c7f2aedc30966856
parent 5616fb1d

core/java_common.mk

+13 −8
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ endif 
# Modules can override this logic by specifying

# LOCAL_JAVA_LANGUAGE_VERSION explicitly.

ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))

  ifdef LOCAL_IS_HOST_MODULE

    # Host modules always default to 1.9

    LOCAL_JAVA_LANGUAGE_VERSION := 1.9

  else

    ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT)))

      LOCAL_JAVA_LANGUAGE_VERSION := 1.7

    else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT)))
@@ -32,6 +36,7 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) 
      LOCAL_JAVA_LANGUAGE_VERSION := 1.9

    endif

  endif

endif

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



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