From 6ce696413aab64940a3bea6cfaa571a2fd8f2bdd Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Fri, 12 Feb 2016 19:01:22 +0800 Subject: [PATCH] land: Use DEVICE_PATH for tree reference Since we define it, let's use it. Change-Id: I975118f844d5d7e47869d0142faae8fc59790481 --- device.mk | 8 ++++---- product/irq.mk | 2 +- product/qcom-audio.mk | 18 +++++++++--------- product/qcom-gps.mk | 12 ++++++------ product/wifi.mk | 16 ++++++++-------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/device.mk b/device.mk index bd52e3e..18ea63e 100644 --- a/device.mk +++ b/device.mk @@ -14,15 +14,15 @@ # limitations under the License. # -DEVICE_PATH := $(LOCAL_PATH) +DEVICE_PATH := device/xiaomi/land # Overlay DEVICE_PACKAGE_OVERLAYS += \ - $(LOCAL_PATH)/overlay \ - $(LOCAL_PATH)/overlay-lineage + $(DEVICE_PATH)/overlay \ + $(DEVICE_PATH)/overlay-lineage # Include device-specific product fragments -include $(LOCAL_PATH)/product/*.mk +include $(DEVICE_PATH)/product/*.mk # Inherit proprietary files $(call inherit-product-if-exists, vendor/xiaomi/land/land-vendor.mk) diff --git a/product/irq.mk b/product/irq.mk index 6db3216..66fadac 100644 --- a/product/irq.mk +++ b/product/irq.mk @@ -1,3 +1,3 @@ # IRQ PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf + $(DEVICE_PATH)/configs/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf diff --git a/product/qcom-audio.mk b/product/qcom-audio.mk index 8b4ca13..0a0dd39 100644 --- a/product/qcom-audio.mk +++ b/product/qcom-audio.mk @@ -16,18 +16,18 @@ PRODUCT_PACKAGES += \ # Audio configuration PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \ - $(LOCAL_PATH)/audio/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \ - $(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \ - $(LOCAL_PATH)/audio/mixer_paths_qrd_sku1.xml:system/etc/mixer_paths_qrd_sku1.xml \ - $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \ - $(LOCAL_PATH)/audio/audio_platform_info.xml:system/etc/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt + $(DEVICE_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \ + $(DEVICE_PATH)/audio/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \ + $(DEVICE_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \ + $(DEVICE_PATH)/audio/mixer_paths_qrd_sku1.xml:system/etc/mixer_paths_qrd_sku1.xml \ + $(DEVICE_PATH)/audio/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \ + $(DEVICE_PATH)/audio/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \ + $(DEVICE_PATH)/audio/audio_platform_info.xml:system/etc/audio_platform_info.xml \ + $(DEVICE_PATH)/audio/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt # XML Audio configuration files PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml \ + $(DEVICE_PATH)/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:/system/etc/a2dp_audio_policy_configuration.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:/system/etc/audio_policy_volumes.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:/system/etc/default_volume_tables.xml \ diff --git a/product/qcom-gps.mk b/product/qcom-gps.mk index 658cf43..ed6f7cc 100644 --- a/product/qcom-gps.mk +++ b/product/qcom-gps.mk @@ -8,12 +8,12 @@ PRODUCT_BOOT_JARS += \ com.qti.location.sdk PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/gps/etc/flp.conf:system/etc/flp.conf \ - $(LOCAL_PATH)/gps/etc/gps.conf:system/etc/gps.conf \ - $(LOCAL_PATH)/gps/etc/izat.conf:system/etc/izat.conf \ - $(LOCAL_PATH)/gps/etc/lowi.conf:system/etc/lowi.conf \ - $(LOCAL_PATH)/gps/etc/sap.conf:system/etc/sap.conf \ - $(LOCAL_PATH)/gps/etc/xtwifi.conf:system/etc/xtwifi.conf + $(DEVICE_PATH)/gps/etc/flp.conf:system/etc/flp.conf \ + $(DEVICE_PATH)/gps/etc/gps.conf:system/etc/gps.conf \ + $(DEVICE_PATH)/gps/etc/izat.conf:system/etc/izat.conf \ + $(DEVICE_PATH)/gps/etc/lowi.conf:system/etc/lowi.conf \ + $(DEVICE_PATH)/gps/etc/sap.conf:system/etc/sap.conf \ + $(DEVICE_PATH)/gps/etc/xtwifi.conf:system/etc/xtwifi.conf # Permissions PRODUCT_COPY_FILES += \ diff --git a/product/wifi.mk b/product/wifi.mk index 9a07f43..f7c9494 100644 --- a/product/wifi.mk +++ b/product/wifi.mk @@ -17,13 +17,13 @@ PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/wifi/hostapd.accept:system/etc/hostapd/hostapd.accept \ - $(LOCAL_PATH)/wifi/hostapd_default.conf:system/etc/hostapd/hostapd_default.conf \ - $(LOCAL_PATH)/wifi/hostapd.deny:system/etc/hostapd/hostapd.deny \ - $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \ - $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf + $(DEVICE_PATH)/wifi/hostapd.accept:system/etc/hostapd/hostapd.accept \ + $(DEVICE_PATH)/wifi/hostapd_default.conf:system/etc/hostapd/hostapd_default.conf \ + $(DEVICE_PATH)/wifi/hostapd.deny:system/etc/hostapd/hostapd.deny \ + $(DEVICE_PATH)/wifi/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \ + $(DEVICE_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/wifi/fstman.ini:system/etc/wifi/fstman.ini \ - $(LOCAL_PATH)/wifi/firmware/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \ - $(LOCAL_PATH)/wifi/firmware/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini + $(DEVICE_PATH)/wifi/fstman.ini:system/etc/wifi/fstman.ini \ + $(DEVICE_PATH)/wifi/firmware/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \ + $(DEVICE_PATH)/wifi/firmware/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini