| commit | 83736642f0370ad593161ee5ea21a50db0fbad7b | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Nov 06 23:18:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 06 23:18:26 2023 +0000 |
| tree | bc3468b7e6fff0a65e74d66dbe89697d23972c5c | |
| parent | 879284e93dfbaa1a68248e028cecd0514bccdaa8 [diff] | |
| parent | 3e228c70634e6af500c97d9fe5a13f48110d7491 [diff] |
Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce6158 am: 3e228c7063 Original change: https://android-review.googlesource.com/c/platform/build/+/2818085 Change-Id: I1196a669af64a661fdd8136b3df41d7581f0e933 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 \