From 002c77903cb439de6580abceb49f0ddcde449730 Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Tue, 5 Nov 2019 18:19:17 -0800 Subject: [PATCH] Create a cellbroadcast apex create a single com.android.cellbroadcast apex to pack two apks together: com.android.cellbroadcastreceiver and com.android.cellbroadcastservice. Bug: 135956699 Test: m com.android.cellbroadcast && adb install com.android.cellbroadcast Change-Id: I01dd26b12411e79a36be9a579f3ef14d1ee2544b --- target/product/go_defaults_common.mk | 1 + target/product/telephony_system.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk index 6bdcd606f7..5d4f5a575c 100644 --- a/target/product/go_defaults_common.mk +++ b/target/product/go_defaults_common.mk @@ -41,6 +41,7 @@ PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false PRODUCT_PACKAGES += InProcessNetworkStack PRODUCT_PACKAGES += InProcessWifiStack PRODUCT_PACKAGES += CellBroadcastAppPlatform +PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform # Strip the local variable table and the local variable type table to reduce # the size of the system image. This has no bearing on stack traces, but will diff --git a/target/product/telephony_system.mk b/target/product/telephony_system.mk index c306a04520..584f3ae470 100644 --- a/target/product/telephony_system.mk +++ b/target/product/telephony_system.mk @@ -21,7 +21,7 @@ PRODUCT_PACKAGES := \ ONS \ CarrierDefaultApp \ CallLogBackup \ - CellBroadcastApp \ - CellBroadcastServiceModule \ + #TODO(b/144301029) \ + com.android.cellbroadcast \ PRODUCT_COPY_FILES := \