From ec6022f2e57df692d17b8445845dd8b4d428a7b7 Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Thu, 7 Oct 2021 21:48:10 +0000
Subject: Update SPL to 2021-12-01

Bug: 202436544
Change-Id: I5f0dea3c6fc94a966c3676cd6ea3cd2684487aff
Merged-In: Ib03873315839e4858f93d1ebbbc17054d46246c9
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 437c173043..0c7e8039aa 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -231,7 +231,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-01
+      PLATFORM_SECURITY_PATCH := 2021-12-01
 endif
 
 ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP
-- 
cgit v1.2.3


From 98dc00d7dd2ff80a7a81b04030c59eb323189626 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 12 Oct 2021 13:30:07 +0900
Subject: Revert "Set VNDK version to current for module builds"

This reverts commit af35677f030d2edae0ad640047abd40066b59932.

Bug: 185769808
Test: banchan com.android.media.swcodec module_arm64; m apps_only dist
Test: banchan com.android.media.swcodec aosp_arm64; m apps_only dist

In both cases, the built APEX doesn't have libsync.so in it.
apex_manifest.pb has libsync.so as requireNativeLibs.

Merged-In: I62397d50a6970a9316f0d6ddd36736f149bc7c2c
Change-Id: I62397d50a6970a9316f0d6ddd36736f149bc7c2c
(cherry picked from commit 83ac8b74819c42b6f5a6fc555fc10d623f5aa79a)
---
 target/board/BoardConfigModuleCommon.mk | 4 ----
 1 file changed, 4 deletions(-)

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
-- 
cgit v1.2.3


From 7a70db721b052d6b43a652d9b01244bcc37d05eb Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 15 Nov 2021 10:58:31 -0800
Subject: 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
---
 core/java_common.mk | 21 +++++++++++++--------
 1 file 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)
-- 
cgit v1.2.3