diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-17 03:59:12 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-17 03:59:12 +0000 |
| commit | ff2c011f26091c647af08b30730941b08a5e4225 (patch) | |
| tree | 5e4df99eae558ce6410f43f477bd34a07be4719e | |
| parent | 54e54d7247e523825c42ca7acb01d27b67d6aed7 (diff) | |
| parent | 7a70db721b052d6b43a652d9b01244bcc37d05eb (diff) | |
| download | build-ff2c011f26091c647af08b30730941b08a5e4225.tar.gz | |
Snap for 7922555 from 7a70db721b052d6b43a652d9b01244bcc37d05eb to mainline-extservices-releaseandroid-mainline-12.0.0_r44
Change-Id: I5d00173aac77eeef881fe6814297a89fe4f5038e
| -rw-r--r-- | core/java_common.mk | 21 |
1 files changed, 13 insertions, 8 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) |