From fbb1a572a10117d21a24a13ab1f1bde87c86d6cb Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 21 Jul 2021 04:48:32 +0000 Subject: [PATCH] Move CDMA feature XML inclusion to device specific mk files So devices not supporting CDMA don't include the feature by mistake. Bug: 194307361 Test: inspect build artifacts - telephony.cdma.xml is included Change-Id: I0fe3a3624d2cda2b57347402d62e8a16513174e5 Merged-In: I0fe3a3624d2cda2b57347402d62e8a16513174e5 (cherry picked from commit d808d99ce089ca4c7ff4e2abe8ee76b4eeb38a64) --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 8c2538f0..0b0db909 100644 --- a/device.mk +++ b/device.mk @@ -888,6 +888,7 @@ USE_RADIO_HAL_1_6 := true ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/common/device-vendor.mk) +PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml endif ifeq (,$(filter %_64,$(TARGET_PRODUCT)))