diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-03-31 00:16:26 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-03-31 00:16:26 -0700 |
| commit | 8daa9b84dcbfd47860ed5d23f03d79c6224cdead (patch) | |
| tree | 689f4dc212c343dc7ef80612e9afdbd713032d3b | |
| parent | a1f2566bd4b7bde5f1d05461cd62f5300fb67700 (diff) | |
| parent | 881dda20c9f27fe28ac094aa6878f5d819ee48cc (diff) | |
Merge 881dda20c9f27fe28ac094aa6878f5d819ee48cc on remote branch
Change-Id: I5a576f2c27e00c0cb646b2898f20b4d86be9c572
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | target/product/handheld_system.mk | 6 | ||||
| -rw-r--r-- | target/product/handheld_system_ext.mk | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 07619e8425..bf17a5b751 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=SKQ1.220303.001 +BUILD_ID=SKQ1.220319.001 diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk index 0392f3f958..20c0690573 100644 --- a/target/product/handheld_system.mk +++ b/target/product/handheld_system.mk @@ -57,7 +57,6 @@ PRODUCT_PACKAGES += \ MusicFX \ PacProcessor \ PrintRecommendationService \ - PrintSpooler \ ProxyHandler \ screenrecord \ SharedStorageBackup \ @@ -75,6 +74,11 @@ 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 d935fbfddf..b6b6ed16dd 100644 --- a/target/product/handheld_system_ext.mk +++ b/target/product/handheld_system_ext.mk @@ -22,9 +22,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk) # /system_ext packages PRODUCT_PACKAGES += \ - Launcher3QuickStep \ Provision \ Settings \ StorageManager \ - SystemUI \ WallpaperCropper \ + +ifneq ($(TARGET_USES_QSPA),true) + PRODUCT_PACKAGES += \ + Launcher3QuickStep \ + SystemUI +endif |