commit 3f74139c35c8b91dde8e8900eb3703c025560bdc
author Wei Li <weiwli@google.com> Thu Oct 19 21:22:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 19 21:22:09 2023 +0000
tree d2d42989fb4fc7ee99e0a2582ab2ad98ab4b1955
parent 058e84c1897f33cc2c7d84aa48dacd41a4de2ff8
parent 37d5a91ea3e47ba838408a1889faa1c8200928a5

[automerger skipped] Add zip2zip as a data dependency of releasetools_common so it is built with releasetools_common and other python_binary_host modules depend on releasetools_common. am: 5c1187e22f -s ours am: 37d5a91ea3 -s ours

am skip reason: Merged-In Iad5aa401de39516876714c854dc07aeba2f234e5 with SHA-1 6437bae07c is already in history

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

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

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index f68c741..58d3d6f 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -381,6 +381,8 @@
   $(call add_json_bool, CopyImagesForTargetFilesZip, $(filter true,$(COPY_IMAGES_FOR_TARGET_FILES_ZIP)))
 
   $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
+
+  $(call add_json_list, ProductPackages, $(sort $(PRODUCT_PACKAGES)))
 $(call end_json_map)
 
 $(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))

core/version_defaults.mk

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

target/product/aosp_product.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:

target/product/handheld_system.mk

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 \