From 8c06c4ea2218e8880f1b3eb92a56618ac2a966ff Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Fri, 1 Jan 2021 15:53:40 -0300 Subject: [PATCH] msm8953-common: Split product, odm and vendor props Signed-off-by: jeangraff30 --- BoardConfigCommon.mk | 5 + common_prop.mk | 215 ------------------------------------------- msm8953.mk | 9 -- odm.prop | 2 + product.prop | 91 ++++++++++++++++++ vendor.prop | 108 ++++++++++++++++++++++ 6 files changed, 206 insertions(+), 224 deletions(-) delete mode 100644 common_prop.mk create mode 100644 odm.prop create mode 100644 product.prop create mode 100644 vendor.prop diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 22e55b8..b591486 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -178,6 +178,11 @@ TARGET_PER_MGR_ENABLED := true # Power TARGET_USES_INTERACTION_BOOST := true +# Properties +TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop +TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop +TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop + # Timeservice BOARD_USES_QC_TIME_SERVICES := true diff --git a/common_prop.mk b/common_prop.mk deleted file mode 100644 index d097955..0000000 --- a/common_prop.mk +++ /dev/null @@ -1,215 +0,0 @@ -# ART -PRODUCT_PROPERTY_OVERRIDES += \ - dalvik.vm.boot-dex2oat-threads=8 \ - dalvik.vm.dex2oat-filter=speed \ - dalvik.vm.dex2oat-threads=8 \ - dalvik.vm.image-dex2oat-filter=speed \ - ro.sys.fw.dex2oat_thread_count=8 \ - ro.vendor.qti.am.reschedule_service=true - -# Audio -PRODUCT_PROPERTY_OVERRIDES += \ - af.fast_track_multiplier=2 \ - audio.deep_buffer.media=true \ - audio.offload.min.duration.secs=30 \ - audio.offload.video=true \ - persist.vendor.audio.dualmic.config=endfire \ - persist.vendor.audio.fluence.voicecall=true \ - persist.vendor.audio.fluence.voicecomm=true \ - persist.vendor.audio.fluence.voicerec=false \ - persist.vendor.audio.fluence.speaker=false \ - persist.vendor.audio.hw.binder.size_kbyte=1024 \ - persist.vendor.audio.ras.enabled=false \ - vendor.persist.speaker.prot.enable=false \ - ro.vendor.audio.sdk.ssr=false \ - ro.vendor.audio.sdk.fluencetype=none \ - ro.qc.sdk.audio.fluencetype=none \ - ro.qc.sdk.audio.ssr=false \ - vendor.audio_hal.period_size=240 \ - vendor.audio.hw.aac.encoder=true \ - vendor.audio.offload.buffer.size.kb=64 \ - vendor.audio.offload.gapless.enabled=false \ - vendor.audio.offload.multiple.enabled=false \ - vendor.audio.offload.pcm.16bit.enable=true \ - vendor.audio.offload.pcm.24bit.enable=true \ - vendor.audio.offload.track.enable=true \ - vendor.audio.parser.ip.buffer.size=262144 \ - vendor.audio.safx.pbe.enabled=true \ - vendor.audio.use.sw.alac.decoder=false \ - vendor.audio.use.sw.ape.decoder=false \ - vendor.voice.path.for.pcm.voip=false \ - vendor.audio.offload.min.duration.secs=30 - -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - use.voice.path.for.pcm.voip=false - -# Bluetooth -PRODUCT_PROPERTY_OVERRIDES += \ - bluetooth.hfp.client=1 \ - vendor.qcom.bluetooth.soc=smd \ - ro.bluetooth.hfp.ver=1.7 - -# Camera -PRODUCT_PROPERTY_OVERRIDES += \ - vidc.enc.dcvs.extra-buff-count=2 \ - -# Charger -PRODUCT_PRODUCT_PROPERTIES += \ - ro.charger.enable_suspend=true - -# Codec2 switch -PRODUCT_PROPERTY_OVERRIDES += \ - debug.media.codec2=2 - -# Color Mode -PRODUCT_PROPERTY_OVERRIDES += \ - vendor.display.enable_default_color_mode=1 - -# Dex2oat -PRODUCT_PROPERTY_OVERRIDES += \ - dalvik.vm.dex2oat64.enabled=true - -# Display -PRODUCT_PROPERTY_OVERRIDES += \ - ro.sf.hwc_set_default_colormode=true \ - debug.sf.enable_hwc_vds=1 \ - debug.sf.hw=1 \ - debug.sf.latch_unsignaled=1 \ - debug.egl.hw=1 \ - persist.hwc.mdpcomp.enable=true \ - vendor.gralloc.enable_fb_ubwc=1 \ - vendor.display.disable_skip_validate=1 \ - vendor.video.disable.ubwc=1 \ - dev.pm.dyn_samplingrate=1 \ - persist.demo.hdmirotationlock=false \ - debug.enable.sglscale=1 \ - debug.gralloc.enable_fb_ubwc=1 \ - debug.sf.recomputecrop=0 \ - ro.opengles.version=196610 \ - ro.qualcomm.cabl=0 - -# Fingerprint -PRODUCT_PROPERTY_OVERRIDES += \ - persist.qfp=false - -# FM -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.fm.use_audio_session=true - -# Media -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - media.stagefright.thumbnail.prefer_hw_codecs=true - -# OMX -# Rank OMX SW codecs lower than OMX HW codecs -PRODUCT_PROPERTY_OVERRIDES += \ - debug.stagefright.omx_default_rank.sw-audio=1 \ - debug.stagefright.omx_default_rank=0 - -# NITZ -PRODUCT_PROPERTY_OVERRIDES += \ - persist.rild.nitz_plmn="" \ - persist.rild.nitz_long_ons_0="" \ - persist.rild.nitz_long_ons_1="" \ - persist.rild.nitz_long_ons_2="" \ - persist.rild.nitz_long_ons_3="" \ - persist.rild.nitz_short_ons_0="" \ - persist.rild.nitz_short_ons_1="" \ - persist.rild.nitz_short_ons_2="" \ - persist.rild.nitz_short_ons_3="" - -# Perf -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.extension_library=libqti-perfd-client.so - -# Time daemon -PRODUCT_PROPERTY_OVERRIDES += \ - persist.timed.enable=true - -# Radio -PRODUCT_PROPERTY_OVERRIDES += \ - persist.dbg.volte_avail_ovr=1 \ - persist.dbg.vt_avail_ovr=1 \ - persist.dbg.wfc_avail_ovr=1 \ - persist.vendor.radio.no_wait_for_card=1 \ - persist.vendor.radio.dfr_mode_set=1 \ - persist.vendor.radio.relay_oprt_change=1 \ - persist.vendor.radio.oem_ind_to_both=0 \ - persist.vendor.radio.qcril_uim_vcc_feature=1 \ - persist.vendor.radio.0x9e_not_callname=1 \ - persist.vendor.radio.mt_sms_ack=30 \ - persist.vendor.radio.force_get_pref=1 \ - persist.vendor.radio.is_wps_enabled=true \ - persist.vendor.radio.custom_ecc=1 \ - persist.vendor.radio.eri64_as_home=1 \ - persist.vendor.radio.data_con_rprt=1 \ - persist.vendor.radio.sib16_support=1 \ - persist.vendor.radio.rat_on=combine \ - persist.vendor.radio.sw_mbn_update=1 \ - persist.vendor.radio.jbims=1 \ - persist.vendor.radio.msgtunnel.start=true \ - persist.vendor.radio.sar_sensor=1 \ - persist.vendor.radio.apn_delay=5000 \ - persist.vendor.radio.calls.on.ims=true \ - persist.vendor.radio.domain.ps=0 \ - persist.vendor.radio.fi_supported=1 \ - persist.vendor.cne.rat.wlan.chip.oem=WCN \ - persist.vendor.sys.cnd.iwlan=1 \ - persist.vendor.data.mode=concurrent \ - persist.data.netmgrd.qos.enable=true \ - persist.radio.aosp_usr_pref_sel=true \ - persist.radio.pb.min.match=7 \ - persist.radio.fi_supported=1 \ - persist.data.qmi.adb_logmask=0 \ - persist.radio.adb_log_on=0 \ - persist.vendor.radio.apm_sim_not_pwdn=1 \ - persist.vendor.radio.procedure_bytes=SKIP \ - persist.vendor.radio.aosp_usr_pref_sel=true \ - persist.vendor.radio.flexmap_type=none \ - persist.vendor.radio.data_con_rprt=true \ - persist.vendor.radio.add_power_save=1 \ - persist.net.doxlat=true \ - persist.vendor.qc.sub.rdump.on=1 \ - persist.vendor.qc.sub.rdump.max=3 \ - ro.telephony.call_ring.multiple=false \ - ro.telephony.default_network=10,10 \ - ro.vendor.telephony.default_network=10,10 \ - ro.vendor.use_data_netmgrd=true \ - ro.telephony.iwlan_operation_mode=legacy \ - persist.vendor.ims.dropset_feature=0 \ - persist.vendor.ims.disableDebugLogs=0 \ - persist.vendor.ims.disableIMSLogs=0 \ - persist.vendor.ims.disableDebugDataPathLogs=0 \ - persist.vendor.ims.disableADBLogs=0 \ - persist.vendor.ims.vt.enableadb=3 \ - persist.vendor.ims.disableQXDMLogs=1 \ - ro.vendor.build.vendorprefix=/vendor \ - vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so \ - ro.telephony.use_old_mnc_mcc_format=true - -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - persist.sys.fflag.override.settings_network_and_internet_v2=true \ - persist.vendor.cne.feature=1 \ - persist.vendor.dpm.feature=0 \ - DEVICE_PROVISIONED=1 \ - ril.subscription.types=NV,RUIM \ - telephony.lteOnCdmaDevice=1 - -# SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - ro.surface_flinger.force_hwc_copy_for_virtual_displays=true \ - ro.surface_flinger.max_virtual_display_dimension=4096 \ - ro.surface_flinger.protected_contents=true \ - ro.surface_flinger.vsync_event_phase_offset_ns=2000000 \ - ro.surface_flinger.vsync_sf_event_phase_offset_ns=6000000 \ - ro.surface_flinger.use_color_management=true - -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_phase_offset_ns=1500000 \ - debug.sf.early_app_phase_offset_ns=1500000 \ - debug.sf.early_gl_phase_offset_ns=3000000 \ - debug.sf.early_gl_app_phase_offset_ns=15000000 - -# Wifi -PRODUCT_PROPERTY_OVERRIDES += \ - wifi.interface=wlan0 diff --git a/msm8953.mk b/msm8953.mk index 29ebb2e..372530d 100644 --- a/msm8953.mk +++ b/msm8953.mk @@ -24,9 +24,6 @@ $(call inherit-product, vendor/motorola/msm8953-common/msm8953-common-vendor.mk) # Common Tree Path COMMON_PATH := device/motorola/msm8953-common -# Inherit properties -$(call inherit-product, $(COMMON_PATH)/common_prop.mk) - # Soong namespaces PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH) @@ -322,12 +319,6 @@ PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \ $(COMMON_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - ro.vendor.qti.va_aosp.support=1 - -PRODUCT_ODM_PROPERTIES += \ - ro.vendor.qti.va_odm.support=1 - # Protobuf PRODUCT_PACKAGES += \ libprotobuf-cpp-full-vendorcompat \ diff --git a/odm.prop b/odm.prop new file mode 100644 index 0000000..21ee00f --- /dev/null +++ b/odm.prop @@ -0,0 +1,2 @@ +# QC framework value-adds +ro.vendor.qti.va_odm.support=1 diff --git a/product.prop b/product.prop new file mode 100644 index 0000000..a57e098 --- /dev/null +++ b/product.prop @@ -0,0 +1,91 @@ +# ART +dalvik.vm.boot-dex2oat-threads=8 +dalvik.vm.dex2oat-filter=speed +dalvik.vm.dex2oat-threads=8 +dalvik.vm.image-dex2oat-filter=speed +ro.sys.fw.dex2oat_thread_count=8 +ro.vendor.qti.am.reschedule_service=true + +# Audio +af.fast_track_multiplier=2 +audio.deep_buffer.media=true +audio.offload.min.duration.secs=30 +audio.offload.video=true +use.voice.path.for.pcm.voip=false + +# Bluetooth +bluetooth.hfp.client=1 + +# CNE +persist.vendor.cne.feature=1 + +# Charger +ro.charger.enable_suspend=true + +# Camera +camera.disable_zsl_mode=true +vidc.enc.dcvs.extra-buff-count=2 + +# Color Mode +vendor.display.enable_default_color_mode=1 + +# Display +ro.sf.hwc_set_default_colormode=true +debug.sf.enable_hwc_vds=1 +debug.sf.hw=1 +debug.sf.latch_unsignaled=1 +debug.egl.hw=1 +persist.hwc.mdpcomp.enable=true +vendor.gralloc.enable_fb_ubwc=1 +vendor.display.disable_skip_validate=1 +vendor.video.disable.ubwc=1 +dev.pm.dyn_samplingrate=1 +persist.demo.hdmirotationlock=false +debug.enable.sglscale=1 +debug.gralloc.enable_fb_ubwc=1 +debug.sf.recomputecrop=0 +ro.opengles.version=196610 +ro.qualcomm.cabl=0 + +# Fingerprint +persist.qfp=false + +# FM +ro.vendor.fm.use_audio_session=true + +# Time daemon +persist.timed.enable=true + +# Media +media.stagefright.thumbnail.prefer_hw_codecs=true + +# OMX +# Rank OMX SW codecs lower than OMX HW codecs +debug.stagefright.omx_default_rank.sw-audio=1 +debug.stagefright.omx_default_rank=0 + +# Radio +persist.sys.fflag.override.settings_network_and_internet_v2=true +persist.vendor.cne.feature=1 +persist.vendor.dpm.feature=0 +DEVICE_PROVISIONED=1 +ril.subscription.types=NV,RUIM +rild.libpath=/vendor/lib64/libril-qc-qmi-1.so +rild.libargs=-d /dev/smd0 +telephony.lteOnCdmaDevice=1 + +# QC framework value-adds +ro.vendor.qti.va_aosp.support=1 + +# SurfaceFlinger +ro.surface_flinger.force_hwc_copy_for_virtual_displays=true +ro.surface_flinger.max_virtual_display_dimension=4096 +ro.surface_flinger.protected_contents=true +ro.surface_flinger.vsync_event_phase_offset_ns=2000000 +ro.surface_flinger.vsync_sf_event_phase_offset_ns=6000000 +ro.surface_flinger.use_color_management=true + +debug.sf.early_phase_offset_ns=1500000 +debug.sf.early_app_phase_offset_ns=1500000 +debug.sf.early_gl_phase_offset_ns=3000000 +debug.sf.early_gl_app_phase_offset_ns=15000000 diff --git a/vendor.prop b/vendor.prop new file mode 100644 index 0000000..7e3aa42 --- /dev/null +++ b/vendor.prop @@ -0,0 +1,108 @@ +# Audio +af.fast_track_multiplier=2 +audio.deep_buffer.media=true +audio.offload.min.duration.secs=30 +audio.offload.video=true +persist.vendor.audio.dualmic.config=endfire +persist.vendor.audio.fluence.voicecall=true +persist.vendor.audio.fluence.voicecomm=true +persist.vendor.audio.fluence.voicerec=false +persist.vendor.audio.fluence.speaker=false +persist.vendor.audio.hw.binder.size_kbyte=1024 +persist.vendor.audio.ras.enabled=false +vendor.persist.speaker.prot.enable=false +ro.vendor.audio.sdk.ssr=false +ro.vendor.audio.sdk.fluencetype=none +ro.qc.sdk.audio.fluencetype=none +ro.qc.sdk.audio.ssr=false +vendor.audio_hal.period_size=240 +vendor.audio.hw.aac.encoder=true +vendor.audio.offload.buffer.size.kb=64 +vendor.audio.offload.gapless.enabled=false +vendor.audio.offload.multiple.enabled=false +vendor.audio.offload.pcm.16bit.enable=true +vendor.audio.offload.pcm.24bit.enable=true +vendor.audio.offload.track.enable=true +vendor.audio.parser.ip.buffer.size=262144 +vendor.audio.safx.pbe.enabled=true +vendor.audio.use.sw.alac.decoder=false +vendor.audio.use.sw.ape.decoder=false +vendor.voice.path.for.pcm.voip=false +vendor.audio.offload.min.duration.secs=30 + +# Bluetooth +bluetooth.hfp.client=1 +vendor.qcom.bluetooth.soc=smd +ro.bluetooth.hfp.ver=1.7 + +# Codec2 switch +debug.media.codec2=2 + +# Dex2oat +dalvik.vm.dex2oat64.enabled=true + +# Perf +ro.vendor.extension_library=libqti-perfd-client.so + +# Radio +persist.dbg.volte_avail_ovr=1 +persist.dbg.vt_avail_ovr=1 +persist.dbg.wfc_avail_ovr=1 +persist.vendor.radio.no_wait_for_card=1 +persist.vendor.radio.dfr_mode_set=1 +persist.vendor.radio.relay_oprt_change=1 +persist.vendor.radio.oem_ind_to_both=0 +persist.vendor.radio.qcril_uim_vcc_feature=1 +persist.vendor.radio.0x9e_not_callname=1 +persist.vendor.radio.mt_sms_ack=30 +persist.vendor.radio.force_get_pref=1 +persist.vendor.radio.is_wps_enabled=true +persist.vendor.radio.custom_ecc=1 +persist.vendor.radio.eri64_as_home=1 +persist.vendor.radio.data_con_rprt=1 +persist.vendor.radio.sib16_support=1 +persist.vendor.radio.rat_on=combine +persist.vendor.radio.sw_mbn_update=1 +persist.vendor.radio.jbims=1 +persist.vendor.radio.msgtunnel.start=true +persist.vendor.radio.sar_sensor=1 +persist.vendor.radio.apn_delay=5000 +persist.vendor.radio.calls.on.ims=true +persist.vendor.radio.domain.ps=0 +persist.vendor.radio.fi_supported=1 +persist.vendor.cne.rat.wlan.chip.oem=WCN +persist.vendor.sys.cnd.iwlan=1 +persist.vendor.data.mode=concurrent +persist.data.netmgrd.qos.enable=true +persist.radio.aosp_usr_pref_sel=true +persist.radio.pb.min.match=7 +persist.radio.fi_supported=1 +persist.data.qmi.adb_logmask=0 +persist.radio.adb_log_on=0 +persist.vendor.radio.apm_sim_not_pwdn=1 +persist.vendor.radio.procedure_bytes=SKIP +persist.vendor.radio.aosp_usr_pref_sel=true +persist.vendor.radio.flexmap_type=none +persist.vendor.radio.data_con_rprt=true +persist.vendor.radio.add_power_save=1 +persist.net.doxlat=true +persist.vendor.qc.sub.rdump.on=1 +persist.vendor.qc.sub.rdump.max=3 +ro.telephony.call_ring.multiple=false +ro.telephony.default_network=10,10 +ro.vendor.telephony.default_network=10,10 +ro.vendor.use_data_netmgrd=true +ro.telephony.iwlan_operation_mode=legacy +persist.vendor.ims.dropset_feature=0 +persist.vendor.ims.disableDebugLogs=0 +persist.vendor.ims.disableIMSLogs=0 +persist.vendor.ims.disableDebugDataPathLogs=0 +persist.vendor.ims.disableADBLogs=0 +persist.vendor.ims.vt.enableadb=3 +persist.vendor.ims.disableQXDMLogs=1 +ro.vendor.build.vendorprefix=/vendor +vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so +ro.telephony.use_old_mnc_mcc_format=true + +# Wifi +wifi.interface=wlan0