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

Commit d35691da authored by Sorin Basca's avatar Sorin Basca
Browse files

Bump Java target from 1.7 to 1.8 in makefiles 

Bug: 320294595
Test: m
Change-Id: I66f3ebf2d6979a8b033c2f475fa21bae26ca97cd
parent 2f7809b4

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