commit 9ec73ca64d6bbea8351959964d01a702a1fb8449
author Mitch Phillips <mitchp@google.com> Mon Oct 23 10:40:04 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 23 10:40:04 2023 +0000
tree e93edb15ca0a37672cdd8508ffd9594306284b02
parent 5aa790b35ef971213d3f9c420dcffc4bc8eb40fe
parent 2d57e36a39316e1b5d79816f41dd6fbd0aea5c7b

Merge "Diable memtag_stack on fullmte builds." into main am: 2d57e36a39

Original change: https://android-review.googlesource.com/c/platform/build/+/2798572

Change-Id: Ib4e121679db960567e615a73063979c310e9b2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6d64f97..dba3596 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -71,9 +71,9 @@
 
 ifneq (,$(MODULE_BUILD_FROM_SOURCE))
   # Keep an explicit setting.
-else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES)))
+else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))
   # Prebuilt module SDKs require prebuilt modules to work, and currently
-  # prebuilt modules are only provided for com.google.android.xxx. If we can't
+  # prebuilt modules are only provided for com.google.android(.go)?.xxx. If we can't
   # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,
   # and disable prebuilt SDKs. In particular this applies to AOSP builds.
   #

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index bed839f..8a68056 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=MAIN
+BUILD_ID=UDC

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 379369e..a43506c 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -105,7 +105,7 @@
     #  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 := 2023-10-05
+    PLATFORM_SECURITY_PATCH := 2023-12-01
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk