diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2024-06-07 01:57:59 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2024-06-07 01:57:59 -0700 |
| commit | 862ce1c301466af4004c784d05e87785248c9b8a (patch) | |
| tree | c72b918b8ad995cfdf34e927864845fae7f033b8 | |
| parent | 3c202a6e71622563448770bc1ae0358e2cae4cf9 (diff) | |
| parent | 97d3e95dead69562793edaf341b71486537a4c4b (diff) | |
Merge 97d3e95dead69562793edaf341b71486537a4c4b on remote branch
Change-Id: Ia96808bd8e5294f4aa5270573030e8c695d5c234
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/product/handheld_system.mk | 6 | ||||
| -rw-r--r-- | target/product/handheld_system_ext.mk | 8 |
4 files changed, 5 insertions, 13 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 5fdd3bc5c3..9d643d8962 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=UKQ1.240510.002 +BUILD_ID=UKQ1.240523.001 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 829fe4b269..5a3714050a 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -113,7 +113,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 := 2024-05-05 + PLATFORM_SECURITY_PATCH := 2024-06-05 endif include $(BUILD_SYSTEM)/version_util.mk diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk index da9b95374d..ecb0ffa71c 100644 --- a/target/product/handheld_system.mk +++ b/target/product/handheld_system.mk @@ -58,6 +58,7 @@ PRODUCT_PACKAGES += \ PacProcessor \ preinstalled-packages-platform-handheld-system.xml \ PrintRecommendationService \ + PrintSpooler \ ProxyHandler \ screenrecord \ SharedStorageBackup \ @@ -75,11 +76,6 @@ PRODUCT_PACKAGES += \ TeleService endif #TARGET_NO_TELEPHONY -ifneq ($(TARGET_USES_QSPA), true) -PRODUCT_PACKAGES += \ - PrintSpooler -endif - ifneq ($(TARGET_HAS_LOW_RAM), true) PRODUCT_PACKAGES += \ SecureElement diff --git a/target/product/handheld_system_ext.mk b/target/product/handheld_system_ext.mk index fc81e58889..187b6275bb 100644 --- a/target/product/handheld_system_ext.mk +++ b/target/product/handheld_system_ext.mk @@ -23,13 +23,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk) # /system_ext packages PRODUCT_PACKAGES += \ AccessibilityMenu \ + Launcher3QuickStep \ Provision \ Settings \ StorageManager \ + SystemUI \ WallpaperCropper \ - -ifneq ($(TARGET_USES_QSPA),true) - PRODUCT_PACKAGES += \ - Launcher3QuickStep \ - SystemUI -endif |