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

Commit 649c0873 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bump Java target from 1.7 to 1.8 in makefiles" into main am: bc32e2d8 

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



Change-Id: I987fd266b58df3fc0c7c2f881599f9ca91a9eaa9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48be0537 bc32e2d8

core/config.mk

+0 −1
Original line number Diff line number Diff line
@@ -1209,7 +1209,6 @@ 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_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))

core/java_common.mk

+2 −6
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ endif 
## Java version

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

# Use the LOCAL_JAVA_LANGUAGE_VERSION if it is set, otherwise

# use one based on the LOCAL_SDK_VERSION. If it is < 24

# pass "1.7" to the tools, if it is unset, >= 24 or "current"

# pass "1.8".

# use one based on the LOCAL_SDK_VERSION.

#

# The LOCAL_SDK_VERSION behavior is to ensure that, by default,

# code that is expected to run on older releases of Android
@@ -25,9 +23,7 @@ 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_1_8_SUPPORT)))

      LOCAL_JAVA_LANGUAGE_VERSION := 1.7

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

    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