Merge "Diable memtag_stack on fullmte builds." into main am: 2d57e36a39 am: 9ec73ca64d
Original change: https://android-review.googlesource.com/c/platform/build/+/2798572
Change-Id: I77a40f71ccb744a6369554ad2beebe210d94f59e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a43506c..1e3eb8c 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-12-01
+ PLATFORM_SECURITY_PATCH := 2023-12-05
endif
include $(BUILD_SYSTEM)/version_util.mk
diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
index a4c3a91..f72f2df 100644
--- a/target/product/aosp_product.mk
+++ b/target/product/aosp_product.mk
@@ -33,6 +33,7 @@
messaging \
PhotoTable \
preinstalled-packages-platform-aosp-product.xml \
+ ThemePicker \
WallpaperPicker \
# Telephony:
diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index 00b62bc..b2064fa 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -45,6 +45,7 @@
CaptivePortalLogin \
CertInstaller \
CredentialManager \
+ DeviceAsWebcam \
DocumentsUI \
DownloadProviderUi \
EasterEgg \