diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-17 15:57:19 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-17 15:57:19 +0000 |
| commit | 4d0b4addce46020d5d29ea0642a71e02b82e9ce4 (patch) | |
| tree | 5e4df99eae558ce6410f43f477bd34a07be4719e | |
| parent | 14b008d79fff1825647d13978a30493edaad6828 (diff) | |
| parent | 7a70db721b052d6b43a652d9b01244bcc37d05eb (diff) | |
| download | build-android12-mainline-art-release.tar.gz | |
Snap for 7924065 from 7a70db721b052d6b43a652d9b01244bcc37d05eb to mainline-art-releaseandroid-mainline-12.0.0_r42android12-mainline-art-release
Change-Id: Ife240a3ad06d777db12eff8cf7f4a225aa4c164a
| -rw-r--r-- | core/java_common.mk | 21 | ||||
| -rw-r--r-- | target/board/BoardConfigModuleCommon.mk | 4 |
2 files changed, 13 insertions, 12 deletions
diff --git a/core/java_common.mk b/core/java_common.mk index 1798ca8452..f97f73c5fe 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -21,15 +21,20 @@ endif # Modules can override this logic by specifying # LOCAL_JAVA_LANGUAGE_VERSION explicitly. ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) - 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))) - LOCAL_JAVA_LANGUAGE_VERSION := 1.8 - 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 + 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))) + LOCAL_JAVA_LANGUAGE_VERSION := 1.8 + 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 + endif endif endif LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION) diff --git a/target/board/BoardConfigModuleCommon.mk b/target/board/BoardConfigModuleCommon.mk index 983247434e..24c01a58ef 100644 --- a/target/board/BoardConfigModuleCommon.mk +++ b/target/board/BoardConfigModuleCommon.mk @@ -4,7 +4,3 @@ # Required for all module devices. TARGET_USES_64_BIT_BINDER := true - -# Necessary to make modules able to use the VNDK via 'use_vendor: true' -# TODO(b/185769808): look into whether this is still used. -BOARD_VNDK_VERSION := current |