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

Commit fc0704bd authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong" into main am:... 

Merge "Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong" into main am: 708dc5bf am: cbc3ace1

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



Change-Id: I3daa947c7b81a114f3cada93e52dbed7862a49e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5102bfc5 cbc3ace1

core/config.mk

+6 −2
Original line number Diff line number Diff line
@@ -1224,8 +1224,12 @@ TARGET_AVAILABLE_SDK_VERSIONS := $(patsubst %/test,test_%,$(TARGET_AVAILABLE_SDK 
TARGET_AVAILABLE_SDK_VERSIONS := $(filter-out %/module-lib %/system-server,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_AVAIALBLE_SDK_VERSIONS := $(call numerically_sort,$(TARGET_AVAILABLE_SDK_VERSIONS))



TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT := $(call numbers_less_than,24,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT := $(call numbers_less_than,30,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_SDK_VERSIONS_WITHOUT_JAVA_1_8_SUPPORT := $(call numbers_less_than,24,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_SDK_VERSIONS_WITHOUT_JAVA_1_9_SUPPORT := $(call numbers_less_than,30,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_SDK_VERSIONS_WITHOUT_JAVA_11_SUPPORT := $(call numbers_less_than,32,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_SDK_VERSIONS_WITHOUT_JAVA_17_SUPPORT := $(call numbers_less_than,34,$(TARGET_AVAILABLE_SDK_VERSIONS))



JAVA_LANGUAGE_VERSIONS_WITHOUT_SYSTEM_MODULES := 1.7 1.8



# This is the standard way to name a directory containing prebuilt target

# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so

core/java_common.mk

+8 −4
Original line number Diff line number Diff line
@@ -25,15 +25,19 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) 
    # 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)))

    ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_1_8_SUPPORT)))

      LOCAL_JAVA_LANGUAGE_VERSION := 1.7

    else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT)))

    else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_1_9_SUPPORT)))

      LOCAL_JAVA_LANGUAGE_VERSION := 1.8

    else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_11_SUPPORT)))

      LOCAL_JAVA_LANGUAGE_VERSION := 1.9

    else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_17_SUPPORT)))

      LOCAL_JAVA_LANGUAGE_VERSION := 11

    else ifneq (,$(LOCAL_SDK_VERSION)$(TARGET_BUILD_USE_PREBUILT_SDKS))

      # TODO(ccross): allow 1.9 for current and unbundled once we have SDK system modules

      LOCAL_JAVA_LANGUAGE_VERSION := 1.8

    else

      LOCAL_JAVA_LANGUAGE_VERSION := 1.9

      LOCAL_JAVA_LANGUAGE_VERSION := 17

    endif

  endif

endif
@@ -410,7 +414,7 @@ endif 
full_java_system_modules_deps :=

my_system_modules_dir :=

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_USE_SYSTEM_MODULES :=

ifeq ($(LOCAL_JAVA_LANGUAGE_VERSION),1.9)

ifeq (,$(filter $(LOCAL_JAVA_LANGUAGE_VERSION),$(JAVA_LANGUAGE_VERSIONS_WITHOUT_SYSTEM_MODULES)))

  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_USE_SYSTEM_MODULES := true

  ifdef my_system_modules

    ifneq ($(my_system_modules),none)