diff --git a/BoardConfig.mk b/BoardConfig.mk index c7df59e3..30ee91b0 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -3,6 +3,8 @@ # Product-specific compile-time definitions. # +DEVICE_PATH := device/xiaomi/wayne + TARGET_BOARD_PLATFORM := sdm660 TARGET_BOARD_SUFFIX := _64 TARGET_BOOTLOADER_BOARD_NAME :=sdm660 @@ -42,9 +44,9 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 #TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_msm ifeq ($(ENABLE_VENDOR_IMAGE), true) - TARGET_RECOVERY_FSTAB := device/qcom/sdm660_64/recovery_non-AB_split_variant.fstab + TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery_non-AB_split_variant.fstab else - TARGET_RECOVERY_FSTAB := device/qcom/sdm660_64/recovery_non-AB_non-split_variant.fstab + TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/sdm660_64/recovery_non-AB_non-split_variant.fstab endif BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 @@ -80,8 +82,8 @@ endif BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3 endif -BOARD_EGL_CFG := device/qcom/sdm660_64/egl.cfg -BOARD_SECCOMP_POLICY := device/qcom/sdm660_32/seccomp +BOARD_EGL_CFG := $(DEVICE_PATH)/egl.cfg +BOARD_SECCOMP_POLICY := $(DEVICE_PATH)/seccomp BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_PAGESIZE := 4096 diff --git a/sdm660_64.mk b/sdm660_64.mk index d61a6915..74e96c76 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -1,6 +1,6 @@ TARGET_USES_AOSP := true -DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay +DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay # Default vendor configuration. ifeq ($(ENABLE_VENDOR_IMAGE),) @@ -40,20 +40,20 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Video codec configuration files ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true) PRODUCT_COPY_FILES += \ - device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.xml \ - device/qcom/sdm660_64/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ - device/qcom/sdm660_64/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - device/qcom/sdm660_64/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml + $(LOCAL_PATH)/media_profiles.xml:system/etc/media_profiles.xml \ + $(LOCAL_PATH)/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ + $(LOCAL_PATH)/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + $(LOCAL_PATH)/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS # video seccomp policy files 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 + $(LOCAL_PATH)/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ + $(LOCAL_PATH)/seccomp/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy -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 +PRODUCT_COPY_FILES += $(LOCAL_PATH)/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/whitelistedapps.xml \ + $(LOCAL_PATH)/gamedwhitelist.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gamedwhitelist.xml \ + $(LOCAL_PATH)/appboosts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/appboosts.xml PRODUCT_PROPERTY_OVERRIDES += \ @@ -124,7 +124,7 @@ ifeq ($(strip $(BOARD_HAVE_QCOM_FM)),true) PRODUCT_BOOT_JARS += qcom.fmradio endif #BOARD_HAVE_QCOM_FM -DEVICE_MANIFEST_FILE := device/qcom/sdm660_64/manifest.xml +DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml DEVICE_MATRIX_FILE := device/qcom/common/compatibility_matrix.xml # Audio configuration file @@ -134,10 +134,10 @@ PRODUCT_PACKAGES += android.hardware.media.omx@1.0-impl # Sensor HAL conf file PRODUCT_COPY_FILES += \ - device/qcom/sdm660_64/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf + $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf # Exclude TOF sensor from InputManager PRODUCT_COPY_FILES += \ - device/qcom/sdm660_64/excluded-input-devices.xml:system/etc/excluded-input-devices.xml + $(LOCAL_PATH)/excluded-input-devices.xml:system/etc/excluded-input-devices.xml # WLAN host driver ifneq ($(WLAN_CHIPSET),) @@ -146,8 +146,8 @@ endif # WLAN driver configuration file PRODUCT_COPY_FILES += \ - device/qcom/sdm660_64/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \ - device/qcom/sdm660_64/wifi_concurrency_cfg.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wifi_concurrency_cfg.txt + $(LOCAL_PATH)/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \ + $(LOCAL_PATH)/wifi_concurrency_cfg.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wifi_concurrency_cfg.txt PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -215,13 +215,13 @@ PRODUCT_PROPERTY_OVERRIDES += \ # FBE support PRODUCT_COPY_FILES += \ - device/qcom/sdm660_64/init.qti.qseecomd.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qseecomd.sh + $(LOCAL_PATH)/init.qti.qseecomd.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qseecomd.sh # MIDI feature PRODUCT_COPY_FILES += frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml # MSM IRQ Balancer configuration file for SDM660 -PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf +PRODUCT_COPY_FILES += $(LOCAL_PATH)/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf # dm-verity configuration PRODUCT_SUPPORTS_VERITY := true