diff options
| -rw-r--r-- | core/config.mk | 1 | ||||
| -rw-r--r-- | core/java_common.mk | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/core/config.mk b/core/config.mk index 469be30be1..3c2a11f178 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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)) diff --git a/core/java_common.mk b/core/java_common.mk index c1ccd1ac29..65feb1532e 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -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 |