diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2024-07-07 16:45:00 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2024-07-07 16:45:00 +0800 |
| commit | dc4dcf768c1fd243efc4849fea50059bca391883 (patch) | |
| tree | d4b9d31627a43346080c5061138d13805afe97bf | |
| parent | 43f085ecd94b6eed5105383a86100e00f94f23e7 (diff) | |
| parent | 862ce1c301466af4004c784d05e87785248c9b8a (diff) | |
Merge tag 'LA.QSSI.14.0.r1-15700-qssi.0' into umineko
LA.QSSI.14.0.r1-15700-qssi.0
Change-Id: I90167c0a3e51a76bfd3494fb3eeac90e4bb272b3
| -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 |