From 00955fcebe57b46cf6b6d562775dd5d38f2ff71c Mon Sep 17 00:00:00 2001 From: chrmhoffmann Date: Sat, 7 Sep 2019 20:41:55 +0200 Subject: [PATCH] sdm845-common: Use TARGET_COPY_OUT_SYSTEM Change-Id: Idff78541e3b35ac297aaabb0f4bb6bf30c25b2b3 --- common.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common.mk b/common.mk index e34a271..c8c3c45 100644 --- a/common.mk +++ b/common.mk @@ -35,8 +35,8 @@ PRODUCT_TARGET_VNDK_VERSION := 29 # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.telephony.ims.xml:system/etc/permissions/android.hardware.telephony.ims.xml \ - frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml + frameworks/native/data/etc/android.hardware.telephony.ims.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.hardware.telephony.ims.xml \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/handheld_core_hardware.xml # A/B AB_OTA_UPDATER := true @@ -101,12 +101,12 @@ PRODUCT_PACKAGES += \ # HotwordEnrollement app permissions PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/privapp-permissions-hotword.xml:system/etc/permissions/privapp-permissions-hotword.xml + $(LOCAL_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml # Input PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/idc/gf_input.idc:system/usr/idc/gf_input.idc \ - $(LOCAL_PATH)/keylayout/gf_input.kl:system/usr/keylayout/gf_input.kl + $(LOCAL_PATH)/idc/gf_input.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/gf_input.idc \ + $(LOCAL_PATH)/keylayout/gf_input.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/gf_input.kl # Lights PRODUCT_PACKAGES += \ @@ -118,7 +118,7 @@ PRODUCT_PACKAGES += \ # Media PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/media_profiles_vendor.xml:system/etc/media_profiles_vendor.xml + $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/media_profiles_vendor.xml # Net PRODUCT_PACKAGES += \ @@ -186,4 +186,4 @@ PRODUCT_BOOT_JARS += \ WfdCommon PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/privapp-permissions-wfd.xml:system/etc/permissions/privapp-permissions-wfd.xml + $(LOCAL_PATH)/configs/privapp-permissions-wfd.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-wfd.xml