diff options
| author | Colin Cross <ccross@android.com> | 2021-11-15 10:58:31 -0800 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-11-16 16:29:45 +0000 |
| commit | 7a70db721b052d6b43a652d9b01244bcc37d05eb (patch) | |
| tree | 5e4df99eae558ce6410f43f477bd34a07be4719e | |
| parent | 5616fb1dc47d87b640c8fd805b36ef037243d81b (diff) | |
| download | build-7a70db721b052d6b43a652d9b01244bcc37d05eb.tar.gz | |
Always default to 1.9 for host java modules in Android.mk files
Host modules shouldn't use the logic for device modules to determine
the java language version to use, always default to 1.9.
Cherry-pick from https://r.android.com/1892956 - this may be necessary
in sc-mainline-prod when it switches to prebuilt SDKs (b/204189791).
Bug: 202761304
Test: presubmits
Change-Id: I268dd34d887db4646e188858c7f2aedc30966856
Merged-In: I268dd34d887db4646e188858c7f2aedc30966856
| -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) |