diff options
| author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2022-01-11 10:59:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-11 10:59:58 +0000 |
| commit | e745b3f8532f45007d1cbf5cf024d9645736e6f1 (patch) | |
| tree | 2ae435e41fe29575010142a84abdf787dee83baf | |
| parent | 3d1596a1d900e7fedd5a5b26b480850884af3193 (diff) | |
| parent | 04d285bcdd70758f7ac23840ffe2083779415df4 (diff) | |
Merge "Disable AOSP module for targets no Telephony" into s-keystone-qcom-dev
| -rw-r--r-- | target/product/generic_system.mk | 6 | ||||
| -rw-r--r-- | target/product/handheld_system.mk | 9 | ||||
| -rw-r--r-- | target/product/telephony_product.mk | 4 | ||||
| -rw-r--r-- | target/product/telephony_system.mk | 6 |
4 files changed, 19 insertions, 6 deletions
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 := \ |