summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-08 13:09:01 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-08 13:09:01 -0700
commitd7afb847c2a348019d0cf35d22b66ed34cc81891 (patch)
tree23976d04f00ee5b834f4be77f70b4c929525f642
parentf597b3ef97e7bdb1e6f48966c957f014dcda44ad (diff)
parent63254e96821f75f6b87f9afc90614be9627fd7ac (diff)
Merge "Install default configuration files in system/vendor/etc/ for 64 bit"
-rw-r--r--sdm660_64.mk25
1 files changed, 7 insertions, 18 deletions
diff --git a/sdm660_64.mk b/sdm660_64.mk
index 8cde134..f011a11 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -37,21 +37,10 @@ TARGET_USE_UI_SVA := true
-include $(QCPATH)/common/config/qtic-config.mk
# Video codec configuration files
-MEDIA_XML_TARGET := system/vendor/etc
-MEDIA_XML_TARGET_VENDOR := vendor/etc
-MEDIA_XML_TARGET_SYSTEM := etc
ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true)
-PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET)/media_profiles.xml \
- device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET_VENDOR)/media_profiles.xml \
- device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_profiles.xml
-
-PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET)/media_codecs.xml \
- device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET_VENDOR)/media_codecs.xml \
- device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_codecs.xml
-
-PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET)/media_codecs_performance.xml \
- device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET_VENDOR)/media_codecs_performance.xml \
- device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_codecs_performance.xml
+PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml
+PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml
+PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS
# video seccomp policy files
@@ -59,9 +48,9 @@ PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
device/qcom/sdm660_64/seccomp/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy
-PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:system/vendor/etc/whitelistedapps.xml \
- device/qcom/sdm660_64/gamedwhitelist.xml:system/vendor/etc/gamedwhitelist.xml \
- device/qcom/sdm660_64/appboosts.xml:system/vendor/etc/appboosts.xml
+PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/whitelistedapps.xml \
+ device/qcom/sdm660_64/gamedwhitelist.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gamedwhitelist.xml \
+ device/qcom/sdm660_64/appboosts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/appboosts.xml
ifneq ($(TARGET_DISABLE_DASH), true)
PRODUCT_BOOT_JARS += qcmediaplayer
@@ -190,7 +179,7 @@ PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/init.qti.qseecomd.sh:system/bin/init.qti.qseecomd.sh
# MSM IRQ Balancer configuration file
-PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf
+PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf
# dm-verity configuration
PRODUCT_SUPPORTS_VERITY := true