sm6125-common: Build QCamera wrapper

Allows SM6125 to use the common Lineage camera HAL without any source
edits. Shifts the camera struct for laurel_sprout to avoid get_cam_pos.
Edits metadata for ginkgo/willow to properly register ID 61 logical
camera.

Change-Id: Iabf37484a401e63dcbcebac3db6bfbd898d78b1f
Signed-off-by: Skyblueborb <tomaszborbely0710@gmail.com>

BoardConfigCommon.mk

@@ -19,11 +19,6 @@ TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := cortex-a73
 
-# ART
-WITH_DEXPREOPT := true
-DEX_PREOPT_DEFAULT := generate-vdex-and-image
-WITH_DEXPREOPT_DEBUG_INFO := false
-
 # Audio
 BOARD_USES_ALSA_AUDIO := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
@@ -42,12 +37,10 @@ TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
 DEVICE_MATRIX_FILE += hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE += hardware/qcom-caf/sm8150/media/conf_files/sm6150/c2_manifest.xml
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
-    hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml
-
-# HWUI
-HWUI_COMPILE_FOR_PERF := true
+    hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml \
+    vendor/lineage/config/device_framework_matrix.xml
 
 # Kernel
 BOARD_BOOTIMG_HEADER_VERSION := 2
@@ -70,7 +63,6 @@ BOARD_KERNEL_CMDLINE += loop.max_part=7
 BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem,nosocket
 BOARD_KERNEL_CMDLINE += buildvariant=user
 BOARD_KERNEL_CMDLINE += androidboot.init_fatal_reboot_target=recovery
-BOARD_KERNEL_CMDLINE += kpti=off
 
 TARGET_KERNEL_SOURCE := kernel/xiaomi/sm6125
 TARGET_KERNEL_CONFIG := vendor/trinket-perf_defconfig vendor/xiaomi-trinket.config

common.mk

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# ART
-PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile
-
 # Audio
 PRODUCT_PACKAGES += \
     android.hardware.audio@7.0-impl \
@@ -125,9 +122,7 @@ PRODUCT_PACKAGES += \
 
 # LiveDisplay
 PRODUCT_PACKAGES += \
-    vendor.lineage.livedisplay-service.sdm
-
-$(call soong_config_set,livedisplay_sdm,enable_dm,false)
+    vendor.lineage.livedisplay@2.0-service-sdm
 
 # Media configs
 PRODUCT_PACKAGES += \

configs/properties/vendor.prop

@@ -1,285 +0,0 @@
-# Audio
-aaudio.hw_burst_min_usec=2000
-aaudio.mmap_exclusive_policy=2
-aaudio.mmap_policy=2
-persist.vendor.audio.ambisonic.auto.profile=false
-persist.vendor.audio.ambisonic.capture=false
-persist.vendor.audio.apptype.multirec.enabled=false
-persist.vendor.audio.avs.afe_api_version=2
-persist.vendor.audio.delta.refresh=true
-persist.vendor.audio.fluence.speaker=true
-persist.vendor.audio.fluence.tmic.enabled=false
-persist.vendor.audio.fluence.voicecall=true
-persist.vendor.audio.fluence.voicerec=true
-persist.vendor.audio.ha_proxy.enabled=true
-persist.vendor.audio.ras.enabled=false
-persist.vendor.audio.ring.filter.mask=0
-persist.vendor.audio.spv3.enable=true
-persist.vendor.audio.voicecall.speaker.stereo=true
-ro.audio.monitorRotation=true
-ro.config.vc_call_vol_steps=11
-ro.vendor.audio.sdk.fluencetype=fluence
-ro.vendor.audio.sdk.ssr=false
-vendor.audio.adm.buffering.ms=12
-vendor.audio.chk.cal.spk=2
-vendor.audio.chk.cal.us=2
-vendor.audio.dolby.ds2.enabled=false
-vendor.audio.dolby.ds2.hardbypass=false
-vendor.audio.feature.a2dp_offload.enable=true
-vendor.audio.feature.afe_proxy.enable=true
-vendor.audio.feature.anc_headset.enable=false
-vendor.audio.feature.audiozoom.enable=false
-vendor.audio.feature.battery_listener.enable=true
-vendor.audio.feature.compr_cap.enable=false
-vendor.audio.feature.compress_in.enable=true
-vendor.audio.feature.compress_meta_data.enable=true
-vendor.audio.feature.compr_voip.enable=false
-vendor.audio.feature.concurrent_capture.enable=true
-vendor.audio.feature.custom_stereo.enable=true
-vendor.audio.feature.deepbuffer_as_primary.enable=false
-vendor.audio.feature.display_port.enable=true
-vendor.audio.feature.dsm_feedback.enable=false
-vendor.audio.feature.dynamic_ecns.enable=true
-vendor.audio.feature.external_dsp.enable=false
-vendor.audio.feature.external_speaker.enable=false
-vendor.audio.feature.external_speaker_tfa.enable=false
-vendor.audio.feature.ext_hw_plugin.enable=false
-vendor.audio.feature.fluence.enable=true
-vendor.audio.feature.fm.enable=true
-vendor.audio.feature.hdmi_edid.enable=true
-vendor.audio.feature.hdmi_passthrough.enable=false
-vendor.audio.feature.hfp.enable=true
-vendor.audio.feature.hifi_audio.enable=false
-vendor.audio.feature.hwdep_cal.enable=false
-vendor.audio.feature.incall_music.enable=true
-vendor.audio.feature.keep_alive.enable=true
-vendor.audio.feature.kpi_optimize.enable=true
-vendor.audio.feature.maxx_audio.enable=false
-vendor.audio.feature.multi_voice_session.enable=true
-vendor.audio.feature.ras.enable=true
-vendor.audio.feature.record_play_concurency.enable=false
-vendor.audio.feature.snd_mon.enable=true
-vendor.audio.feature.spkr_prot.enable=true
-vendor.audio.feature.src_trkn.enable=true
-vendor.audio.feature.ssrec.enable=false
-vendor.audio.feature.usb_offload_burst_mode.enable=true
-vendor.audio.feature.usb_offload.enable=true
-vendor.audio.feature.usb_offload_sidetone_volume.enable=false
-vendor.audio.feature.vbat.enable=true
-vendor.audio.feature.wsa.enable=false
-vendor.audio.hal.boot.timeout.ms=20000
-vendor.audio_hal.in_period_size=144
-vendor.audio.hal.output.suspend.supported=true
-vendor.audio_hal.period_multiplier=3
-vendor.audio_hal.period_size=192
-vendor.audio.hw.aac.encoder=true
-vendor.audio.offload.buffer.size.kb=256
-vendor.audio.offload.gapless.enabled=true
-vendor.audio.offload.multiaac.enable=true
-vendor.audio.offload.multiple.enabled=false
-vendor.audio.offload.passthrough=false
-vendor.audio.offload.track.enable=true
-vendor.audio.safx.pbe.enabled=false
-vendor.audio.use.sw.alac.decoder=true
-vendor.audio.use.sw.ape.decoder=true
-vendor.audio.use.sw.mpegh.decoder=true
-vendor.audio.volume.headset.gain.depcal=true
-vendor.voice.path.for.pcm.voip=true
-
-# Bluetooth
-bluetooth.profile.a2dp.source.enabled=true
-bluetooth.profile.asha.central.enabled=false
-bluetooth.profile.avrcp.target.enabled=true
-bluetooth.profile.avrcp.controller.enabled=false
-bluetooth.profile.hfp.ag.enabled=true
-bluetooth.profile.gatt.enabled=true
-bluetooth.profile.hid.device.enabled=true
-bluetooth.profile.hid.host.enabled=true
-bluetooth.profile.map.server.enabled=true
-bluetooth.profile.opp.enabled=true
-bluetooth.profile.pan.nap.enabled=true
-bluetooth.profile.pan.panu.enabled=true
-bluetooth.profile.pbap.server.enabled=true
-bluetooth.profile.sap.server.enabled=false
-persist.bluetooth.a2dp_offload.disabled=false
-persist.vendor.bluetooth.modem_nv_support=true
-persist.vendor.bt.aac_frm_ctl.enabled=true
-persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
-persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
-persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=false
-persist.vendor.qcom.bluetooth.enable.splita2dp=true
-persist.vendor.qcom.bluetooth.scram.enabled=false
-persist.vendor.qcom.bluetooth.twsp_state.enabled=false
-ro.bluetooth.a2dp_offload.supported=true
-ro.vendor.bluetooth.wipower=false
-vendor.qcom.bluetooth.soc=cherokee
-persist.vendor.btstack.enable.twsplus=true 
-persist.vendor.btstack.enable.twsplussho=true
-
-# Camera
-camera.disable_zsl_mode=true
-vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera
-persist.vendor.camera.logInfoMask=false
-persist.vendor.camera.perflock.enable=0
-
-# Dalvik
-dalvik.vm.dex2oat64.enabled=true
-dalvik.vm.dex2oat-cpu-set=4,5,6,7
-dalvik.vm.dex2oat-threads=4
-dalvik.vm.image-dex2oat-cpu-set=4,5,6,7
-dalvik.vm.image-dex2oat-threads=4
-
-# Display
-debug.sf.frame_rate_multiple_threshold=120
-ro.surface_flinger.enable_frame_rate_override=false
-ro.surface_flinger.force_hwc_copy_for_virtual_displays=true
-ro.surface_flinger.game_default_frame_rate_override=120
-ro.surface_flinger.has_wide_color_display=false
-ro.surface_flinger.max_virtual_display_dimension=4096
-ro.surface_flinger.protected_contents=true
-ro.surface_flinger.use_color_management=true
-ro.surface_flinger.set_display_power_timer_ms=800
-ro.surface_flinger.set_idle_timer_ms=3500
-ro.surface_flinger.set_touch_timer_ms=4000
-ro.surface_flinger.wcg_composition_dataspace=143261696
-ro.vendor.display.sensortype=2
-ro.vendor.display.svi=1
-vendor.display.comp_mask=0
-vendor.display.disable_excl_rect=0
-vendor.display.disable_excl_rect_partial_fb=1
-vendor.display.disable_hw_recovery_dump=1
-vendor.display.disable_offline_rotator=0
-vendor.display.disable_rotator_ubwc=1
-vendor.display.disable_rounded_corner_thread=0
-vendor.display.disable_scaler=0
-vendor.display.enable_allow_idle_fallback=1
-vendor.display.enable_async_powermode=1
-vendor.display.enable_camera_smooth=1
-vendor.display.enable_early_wakeup=1
-vendor.display.enable_optimize_refresh=1
-vendor.display.enable_perf_hint_large_comp_cycle=1
-vendor.display.enable_posted_start_dyn=1
-vendor.display.enable_rc_support=1
-vendor.display.enable_rounded_corner=0
-vendor.display.idle_time=0
-vendor.display.override_doze_mode=1
-vendor.display.svi.config=1
-vendor.display.svi.config_path=/vendor/etc/SVIConfig.xml
-vendor.display.target.version=3
-vendor.display.use_smooth_motion=1
-vendor.display.disable_partial_split=1
-
-# DPM
-persist.vendor.dpmhalservice.enable=1
-
-# DRM
-drm.service.enabled=true
-
-# FRP
-ro.frp.pst=/dev/block/bootdevice/by-name/frp
-
-# Graphics
-debug.sf.auto_latch_unsignaled=0
-debug.sf.disable_backpressure=1
-debug.sf.disable_client_composition_cache=0
-debug.sf.enable_adpf_cpu_hint=true
-debug.sf.enable_advanced_sf_phase_offset=1
-debug.sf.enable_gl_backpressure=0
-debug.sf.enable_transaction_tracing=false
-debug.sf.high_fps_early_gl_phase_offset_ns=-4000000
-debug.sf.high_fps_early_phase_offset_ns=-4000000
-debug.sf.high_fps_late_app_phase_offset_ns=1000000
-debug.sf.high_fps_late_sf_phase_offset_ns=-4000000
-debug.sf.predict_hwc_composition_strategy=0
-debug.sf.treat_170m_as_sRGB=1
-persist.sys.sf.color_mode=7
-persist.sys.sf.color_saturation=1.0
-persist.sys.sf.native_mode=258
-ro.hardware.egl=adreno
-ro.hardware.vulkan=adreno
-ro.opengles.version=196610
-vendor.gralloc.disable_ubwc=0
-vendor.gralloc.secure_preview_buffer_format=420_sp
-vendor.gralloc.secure_preview_only=1
-
-# HWUI
-ro.hwui.render_ahead=5
-debug.hwui.use_hint_manager=true
-debug.hwui.target_cpu_time_percent=30
-
-# Incremental FS
-ro.incremental.enable=true
-
-# Logcat spam
-persist.log.tag.BackgroundInstallControlService=S
-persist.log.tag.HWUI=S
-persist.log.tag.ConnectivityService=S
-persist.log.tag.vendor.qti.bluetooth@1.0-ibs_handler=S
-persist.log.tag.vendor.qti.bluetooth@1.0-wake_lock=S
-persist.log.tag.AppOps=S
-persist.log.tag.FrameTracker=S
-
-# Media
-debug.stagefright.c2inputsurface=-1
-vendor.media.target_variant=_blair
-vendor.netflix.bsp_rev=Q4350-32962-1
-
-# Perf
-ro.vendor.extension_library=libqti-perfd-client.so
-vendor.perf.framepacing.enable=1
-
-# Radio
-persist.dbg.ims_volte_enable=1
-persist.dbg.volte_avail_ovr=1
-persist.dbg.vt_avail_ovr=1
-persist.dbg.wfc_avail_ovr=1
-persist.vendor.data.iwlan.enable=true
-
-# RIL
-persist.radio.multisim.config=dsds
-persist.vendor.radio.add_power_save=1
-persist.vendor.radio.apm_sim_not_pwdn=1
-persist.vendor.radio.custom_ecc=1
-persist.vendor.radio.enableadvancedscan=true
-persist.vendor.radio.enable_temp_dds=true
-persist.vendor.radio.procedure_bytes=SKIP
-persist.vendor.radio.rat_on=combine
-persist.vendor.radio.sib16_support=1
-ro.telephony.default_network=33,33
-persist.cust.tel.eons=1
-ro.telephony.block_binder_thread_on_incoming_calls=false
-
-# ScrollOptimizer
-persist.sys.perf.scroll_opt=true
-persist.sys.perf.scroll_opt.heavy_app=1
-
-# Sensors
-persist.vendor.sensors.enable.bypass_worker=true
-persist.vendor.sensors.enable.mag_filter=true
-persist.vendor.sensors.enable.rt_task=false
-persist.vendor.sensors.hal_trigger_ssr=false
-persist.vendor.sensors.support_direct_channel=false
-persist.vendor.sensors.sync_request=true
-
-# SoC
-ro.boot.product.vendor.sku=holi
-ro.soc.manufacturer=QTI
-ro.soc.model=SM6375
-
-# USB
-ro.usb.uvc.disable_video_encode_flag=true
-ro.usb.uvc.enabled=true
-sys.usb.mtp.batchcancel=1
-vendor.usb.controller=4e00000.dwc3
-vendor.usb.diag.func.name=ffs
-vendor.usb.dpl.inst.name=dpl
-vendor.usb.qdss.inst.name=qdss_sw
-vendor.usb.rmnet.func.name=gsi
-vendor.usb.rmnet.inst.name=rmnet
-vendor.usb.rndis.func.name=gsi
-vendor.usb.use_ffs_mtp=1
-vendor.usb.use_gadget_hal=1
-vendor.usb.uvc.payload_transfer_size=1024
-
-# WiFi
-wifi.aware.interface=wifi-aware0

evolution.dependencies

@@ -7,8 +7,12 @@
     "repository": "kernel_xiaomi_sm6125",
     "target_path": "kernel/xiaomi/sm6125"
   },
+  {
+    "repository": "hardware_xiaomi",
+    "target_path": "hardware/xiaomi"
+  },
   {
     "repository": "vendor_xiaomi_sm6125-common",
     "target_path": "vendor/xiaomi/sm6125-common"
   }
-]
+]

manifest.xml

@@ -261,4 +261,13 @@
         <fqname>@1.0::IIWlan/slot1</fqname>
         <fqname>@1.0::IIWlan/slot2</fqname>
     </hal>
+    <hal format="hidl">
+        <name>vendor.lineage.livedisplay</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IPictureAdjustment</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>

product.prop

@@ -5,9 +5,6 @@ audio.sys.noisy.broadcast.delay=500
 audio.sys.offload.pstimeout.secs=3
 audio.sys.routing.latency=0
 
-# eBPF
-ro.bpf.kver_override=5.4.299
-
 # RIL
 persist.vendor.qti.telephony.vt_cam_interface=2
 persist.vendor.radio.report_codec=1

vendor.prop

@@ -168,9 +168,7 @@ debug.egl.hw=0
 debug.force_no_blanking=true
 debug.mdpcomp.logs=0
 debug.sf.hw=0
-debug.sf.disable_client_composition_cache=0
-debug.sf.enable_adpf_cpu_hint=true
-debug.sf.enable_gl_backpressure=0
+debug.sf.disable_client_composition_cache=1
 persist.sys.sf.color_mode=0
 persist.sys.sf.color_saturation=1.0
 persist.sys.sf.native_mode=2
@@ -179,6 +177,11 @@ ro.hardware.vulkan=adreno
 ro.opengles.version=196610
 vendor.gralloc.disable_ubwc=0
 
+# HWUI
+ro.hwui.render_ahead=5
+debug.hwui.use_hint_manager=true
+debug.hwui.target_cpu_time_percent=30
+
 # Keystore
 ro.hardware.keystore_desede=true
 
@@ -204,10 +207,6 @@ persist.vendor.sensors.support_direct_channel=false
 ro.com.android.dataroaming=true
 ro.telephony.default_network=22,22
 
-# ScrollOptimizer
-persist.sys.perf.scroll_opt=true
-persist.sys.perf.scroll_opt.heavy_app=1
-
 # SurfaceFlinger
 ro.surface_flinger.force_hwc_copy_for_virtual_displays=true
 ro.surface_flinger.max_frame_buffer_acquired_buffers=3