summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/build_id.mk2
-rw-r--r--target/product/generic_system.mk6
-rw-r--r--target/product/handheld_system.mk9
-rw-r--r--target/product/telephony_product.mk4
-rw-r--r--target/product/telephony_system.mk6
5 files changed, 20 insertions, 7 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 07cfb9cf4b..6ab8cf6da0 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.220111.001
+BUILD_ID=SKQ1.220112.001
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 2176672aa8..a7f3ebb6fe 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -32,9 +32,13 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
LiveWallpapersPicker \
PartnerBookmarksProvider \
- Stk \
Tag \
+ifneq ($(TARGET_NO_TELEPHONY), true)
+PRODUCT_PACKAGES += \
+ Stk
+endif #TARGET_NO_TELEPHONY
+
# OTA support
PRODUCT_PACKAGES += \
recovery-refresh \
diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index 36723d81aa..0392f3f958 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -53,7 +53,6 @@ PRODUCT_PACKAGES += \
KeyChain \
librs_jni \
ManagedProvisioning \
- MmsService \
MtpService \
MusicFX \
PacProcessor \
@@ -64,13 +63,17 @@ PRODUCT_PACKAGES += \
SharedStorageBackup \
SimAppDialog \
Telecom \
- TelephonyProvider \
- TeleService \
Traceur \
UserDictionaryProvider \
VpnDialogs \
vr \
+ifneq ($(TARGET_NO_TELEPHONY), true)
+PRODUCT_PACKAGES += \
+ MmsService \
+ TelephonyProvider \
+ TeleService
+endif #TARGET_NO_TELEPHONY
ifneq ($(TARGET_HAS_LOW_RAM), true)
PRODUCT_PACKAGES += \
diff --git a/target/product/telephony_product.mk b/target/product/telephony_product.mk
index 18374d4b23..5b2709c7b0 100644
--- a/target/product/telephony_product.mk
+++ b/target/product/telephony_product.mk
@@ -18,6 +18,8 @@
# hardware, and install to the product partition.
# /product packages
+ifneq ($(TARGET_NO_TELEPHONY), true)
PRODUCT_PACKAGES += \
Dialer \
- ImsServiceEntitlement \
+ ImsServiceEntitlement
+endif #TARGET_NO_TELEPHONY
diff --git a/target/product/telephony_system.mk b/target/product/telephony_system.mk
index 81e7aa2701..80b6c6503a 100644
--- a/target/product/telephony_system.mk
+++ b/target/product/telephony_system.mk
@@ -21,10 +21,14 @@
TARGET_USES_QCOM_BSP_ATEL := true
PRODUCT_PACKAGES := \
+
+ifneq ($(TARGET_NO_TELEPHONY), true)
+PRODUCT_PACKAGES += \
ONS \
CarrierDefaultApp \
CallLogBackup \
com.android.cellbroadcast \
- CellBroadcastLegacyApp \
+ CellBroadcastLegacyApp
+endif #TARGET_NO_TELEPHONY
PRODUCT_COPY_FILES := \