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

Commit 35c2a2d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Always default to 1.9 for host java modules in Android.mk files" am:... 

Merge "Always default to 1.9 for host java modules in Android.mk files" am: f1e1bcb0 am: 4acd14b2

Original change: https://android-review.googlesource.com/c/platform/build/+/1892956

Change-Id: Ic304f42d225e1cc357f6276c0be3dffe9341cc5c
parents ca8f517b 4acd14b2

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)



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