diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-09 13:00:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-09 13:00:22 +0000 |
| commit | 0ed4b14c2d47a8800085592cd7c2bfc68f24ba2c (patch) | |
| tree | 6e082c22f0d8de8fcaba398ff54502fde78ff1e4 | |
| parent | 560ec2b37d03e37e8d621fe6a1d0ecb5a42f2d56 (diff) | |
| parent | e6d21cc60b2baa5d0b6395cee5236dbc1ceed7eb (diff) | |
| download | build-android-mainline-12.0.0_r63.tar.gz | |
Snap for 7984612 from e6d21cc60b2baa5d0b6395cee5236dbc1ceed7eb to mainline-networking-releaseandroid-mainline-12.0.0_r63android-mainline-12.0.0_r59
Change-Id: I036719a4350d2eecbc90295d1e7a131cf7e30c50
| -rw-r--r-- | core/java_common.mk | 21 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 14 insertions, 9 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/core/version_defaults.mk b/core/version_defaults.mk index dbc32e1157..6a9d92ea5c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -246,7 +246,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2021-11-05 + PLATFORM_SECURITY_PATCH := 2022-01-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |