From 7b0e0c60a0a8bb780a6f89bcc74c9ed30f40e90f Mon Sep 17 00:00:00 2001 From: Max Weffers Date: Thu, 2 Jan 2020 13:51:51 +0100 Subject: [PATCH] clover: Treewide: Cleanup and Reorder * Remove Double Definition * Reordeder Alphabetic * Move Audio and Media Files to Configs * Move sensor files to configs * Reorder Properties * Fix whitespaces --- carbon_clover.mk | 4 +- .../audio}/audio_platform_info_intcodec.xml | 0 {audio => configs/audio}/mixer_paths.xml | 0 .../media}/media_profiles_V1_0.xml | 0 .../sensors}/sensor_def_qcomdev.conf | 0 device.mk | 34 +++++----- device_prop.mk | 63 ++++++++----------- 7 files changed, 43 insertions(+), 58 deletions(-) rename {audio => configs/audio}/audio_platform_info_intcodec.xml (100%) rename {audio => configs/audio}/mixer_paths.xml (100%) rename {media => configs/media}/media_profiles_V1_0.xml (100%) rename {sensors => configs/sensors}/sensor_def_qcomdev.conf (100%) diff --git a/carbon_clover.mk b/carbon_clover.mk index 4a391a8..00c6f83 100644 --- a/carbon_clover.mk +++ b/carbon_clover.mk @@ -33,8 +33,6 @@ $(call inherit-product, vendor/carbon/config/common.mk) # Define first api level $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_o_mr1.mk) -DEVICE_PATH := device/xiaomi/clover - # CarbonRom Maintainer PRODUCT_PROPERTY_OVERRIDES += \ ro.carbon.maintainer="Rcstar6696" @@ -49,4 +47,4 @@ PRODUCT_MODEL := MI PAD 4 # Build Fingerprint PRODUCT_BUILD_PROP_OVERRIDES += \ - PRIVATE_BUILD_DESC="clover-user 8.1.0 OPM1.171019.019 9.7.4 release-keys" + PRIVATE_BUILD_DESC="clover-user 8.1.0 OPM1.171019.019 9.7.4 release-keys" diff --git a/audio/audio_platform_info_intcodec.xml b/configs/audio/audio_platform_info_intcodec.xml similarity index 100% rename from audio/audio_platform_info_intcodec.xml rename to configs/audio/audio_platform_info_intcodec.xml diff --git a/audio/mixer_paths.xml b/configs/audio/mixer_paths.xml similarity index 100% rename from audio/mixer_paths.xml rename to configs/audio/mixer_paths.xml diff --git a/media/media_profiles_V1_0.xml b/configs/media/media_profiles_V1_0.xml similarity index 100% rename from media/media_profiles_V1_0.xml rename to configs/media/media_profiles_V1_0.xml diff --git a/sensors/sensor_def_qcomdev.conf b/configs/sensors/sensor_def_qcomdev.conf similarity index 100% rename from sensors/sensor_def_qcomdev.conf rename to configs/sensors/sensor_def_qcomdev.conf diff --git a/device.mk b/device.mk index f48fb10..e44e1d3 100644 --- a/device.mk +++ b/device.mk @@ -28,18 +28,10 @@ $(call inherit-product, device/xiaomi/sdm660-common/sdm660.mk) # Device Path DEVICE_PATH := device/xiaomi/clover -# Soong -PRODUCT_SOONG_NAMESPACES += \ - $(DEVICE_PATH) - -# Overlays -DEVICE_PACKAGE_OVERLAYS += \ - $(DEVICE_PATH)/overlay - # Audio PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ - $(DEVICE_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + $(DEVICE_PATH)/configs/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ + $(DEVICE_PATH)/configs/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml # Boot animation TARGET_SCREEN_HEIGHT := 1920 @@ -50,20 +42,24 @@ $(call inherit-product, $(DEVICE_PATH)/device_prop.mk) # Media PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml + $(DEVICE_PATH)/configs/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml # Keylayout PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/configs/keylayout/sdm660-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sdm660-snd-card_Button_Jack.kl + $(DEVICE_PATH)/configs/keylayout/sdm660-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sdm660-snd-card_Button_Jack.kl + +# Overlays +DEVICE_PACKAGE_OVERLAYS += \ + $(DEVICE_PATH)/overlay # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml + frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml # Ramdisk PRODUCT_PACKAGES += \ - init.device.rc \ - init.macaddress_setup.sh + init.device.rc \ + init.macaddress_setup.sh # Screen density PRODUCT_AAPT_CONFIG := large @@ -71,11 +67,15 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi # Sensors PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf + $(DEVICE_PATH)/configs/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf + +# Soong +PRODUCT_SOONG_NAMESPACES += \ + $(DEVICE_PATH) # Tablet features PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml + frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml # Vendor files $(call inherit-product, vendor/xiaomi/clover/clover-vendor.mk) diff --git a/device_prop.mk b/device_prop.mk index 4f86f50..31a13f8 100644 --- a/device_prop.mk +++ b/device_prop.mk @@ -23,56 +23,43 @@ # ACDB PRODUCT_PROPERTY_OVERRIDES += \ - persist.audio.calfile0=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Bluetooth_cal.acdb \ - persist.audio.calfile1=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_General_cal.acdb \ - persist.audio.calfile2=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Global_cal.acdb \ - persist.audio.calfile3=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Handset_cal.acdb \ - persist.audio.calfile4=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Hdmi_cal.acdb \ - persist.audio.calfile5=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Headset_cal.acdb \ - persist.audio.calfile6=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Speaker_cal.acdb \ - persist.audio.calfile7=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_workspaceFile.qwsp \ - persist.audio.calfile8=/vendor/etc/acdbdata/adsp_avs_config.acdb \ - persist.audio.calfile0D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Bluetooth_cal.acdb \ - persist.audio.calfile1D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_General_cal.acdb \ - persist.audio.calfile2D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Global_cal.acdb \ - persist.audio.calfile3D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Handset_cal.acdb \ - persist.audio.calfile4D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Hdmi_cal.acdb \ - persist.audio.calfile5D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Headset_cal.acdb \ - persist.audio.calfile6D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Speaker_cal.acdb \ - persist.audio.calfile7D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_workspaceFile.qwsp \ - persist.audio.calfile8D9P=/vendor/etc/acdbdata/adsp_avs_config.acdb + persist.audio.calfile0=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Bluetooth_cal.acdb \ + persist.audio.calfile1=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_General_cal.acdb \ + persist.audio.calfile2=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Global_cal.acdb \ + persist.audio.calfile3=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Handset_cal.acdb \ + persist.audio.calfile4=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Hdmi_cal.acdb \ + persist.audio.calfile5=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Headset_cal.acdb \ + persist.audio.calfile6=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Speaker_cal.acdb \ + persist.audio.calfile7=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_workspaceFile.qwsp \ + persist.audio.calfile8=/vendor/etc/acdbdata/adsp_avs_config.acdb \ + persist.audio.calfile0D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Bluetooth_cal.acdb \ + persist.audio.calfile1D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_General_cal.acdb \ + persist.audio.calfile2D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Global_cal.acdb \ + persist.audio.calfile3D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Handset_cal.acdb \ + persist.audio.calfile4D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Hdmi_cal.acdb \ + persist.audio.calfile5D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Headset_cal.acdb \ + persist.audio.calfile6D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Speaker_cal.acdb \ + persist.audio.calfile7D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_workspaceFile.qwsp \ + persist.audio.calfile8D9P=/vendor/etc/acdbdata/adsp_avs_config.acdb # Audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.audio.sdk.fluencetype=fluence \ - persist.vendor.audio.fluence.voicecall=true \ - persist.vendor.audio.fluence.voicerec=true \ - persist.vendor.audio.fluence.speaker=true \ - persist.vendor.audio.fluence.audiorec=true \ - vendor.audio.adm.buffering.ms=3 \ - vendor.audio.offload.track.enable=true + persist.vendor.audio.fluence.audiorec=true # Camera PRODUCT_PROPERTY_OVERRIDES += \ - persist.radio.VT_CAM_INTERFACE=1 \ - persist.camera.stats.test=5 \ - persist.camera.HAL3.enabled=1 \ - persist.camera.preview.ubwc=0 + persist.camera.stats.test=5 \ + persist.camera.HAL3.enabled=1 \ + persist.camera.preview.ubwc=0 # Display PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.recomputecrop=0 \ - debug.vds.allow_hwc=0 - -# System property for color temperature -PRODUCT_PROPERTY_OVERRIDES += \ - ro.colorpick_adjust=true \ - ro.df.effect.conflict=1 + debug.vds.allow_hwc=0 # Single SIM PRODUCT_PROPERTY_OVERRIDES += \ - persist.radio.multisim.config=ssss + persist.radio.multisim.config=ssss # Ultra Sound PRODUCT_PROPERTY_OVERRIDES += \ - audio.chk.cal.us=0 + audio.chk.cal.us=0