zenfone8: Build Display Hals from qcom sources
Move the Asus's add-on compatibility matrix in their own .xml
Change-Id: Icfdb55b4303494aba019ab4fe49cd3a16b0efa23
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3cd1352..1d77674 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -119,7 +119,8 @@
BOARD_EXT4_SHARE_DUP_BLOCKS := true
#HIDL
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/vendor_framework_compatibility_matrix.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/vendor_framework_compatibility_matrix.xml \
+ $(DEVICE_PATH)/asus_framework_matrix.xml
DEVICE_FRAMEWORK_MANIFEST_FILE += $(DEVICE_PATH)/framework_manifest.xml
DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_lahaina.xml
DEVICE_MATRIX_FILE += $(DEVICE_PATH)/compatibility_matrix.xml
diff --git a/asus_framework_matrix.xml b/asus_framework_matrix.xml
new file mode 100644
index 0000000..374c41f
--- /dev/null
+++ b/asus_framework_matrix.xml
@@ -0,0 +1,44 @@
+<compatibility-matrix version="4.0" type="framework">
+ <hal format="hidl">
+ <name>vendor.goodix.hardware.biometrics.fingerprint</name>
+ <transport>hwbinder</transport>
+ <version>2.1</version>
+ <interface>
+ <name>IGoodixFingerprintDaemon</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.nxp.nxpnfc</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>INxpNfc</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.pixelworks.hardware.display</name>
+ <version>1.1</version>
+ <interface>
+ <name>IIris</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.pixelworks.hardware.feature</name>
+ <version>1.0</version>
+ <interface>
+ <name>IIrisFeature</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.qti.sla.service</name>
+ <version>1.0</version>
+ <interface>
+ <name>ISlaService</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</compatibility-matrix>
\ No newline at end of file
diff --git a/device.mk b/device.mk
index 9453775..ff5ce5d 100755
--- a/device.mk
+++ b/device.mk
@@ -146,6 +146,13 @@
libion \
libtinyxml2
+$(call inherit-product, hardware/qcom-caf/sm8350/media/product.mk)
+$(call inherit-product, hardware/qcom-caf/sm8350/display/config/display-board.mk)
+$(call inherit-product, hardware/qcom-caf/sm8350/display/config/display-product.mk)
+$(call inherit-product, vendor/qcom/opensource/display/config/display-product-vendor.mk)
+$(call inherit-product, vendor/qcom/opensource/commonsys/display/config/display-product-commonsys.mk)
+$(call inherit-product, vendor/qcom/opensource/commonsys-intf/display/config/display-interfaces-product.mk)
+
PRODUCT_PACKAGES += \
libtinyalsa
@@ -342,7 +349,3 @@
#PRODUCT_BOOT_JARS += \
WfdCommon
-
-$(call inherit-product, hardware/qcom-caf/sm8350/media/product.mk)
-$(call inherit-product, vendor/qcom/opensource/commonsys-intf/display/config/display-product-system.mk)
-$(call inherit-product, vendor/qcom/opensource/commonsys/display/config/display-product-commonsys.mk)
diff --git a/omni.dependencies b/omni.dependencies
index a01a76a..d3937e8 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -13,6 +13,13 @@
},
{
"remote": "github",
+ "repository": "micky387/android_hardware_qcom_display",
+ "target_path": "hardware/qcom-caf/sm8350/display",
+ "override": "platform/hardware/qcom/display",
+ "revision": "lineage-19.0-caf-sm8350"
+ },
+ {
+ "remote": "github",
"repository": "LineageOS/android_hardware_qcom_media",
"target_path": "hardware/qcom-caf/sm8350/media",
"revision": "lineage-19.0-caf-sm8350"
@@ -50,6 +57,12 @@
},
{
"remote": "gitlab",
+ "repository": "android_vendor_qcom_opensource_display",
+ "target_path": "vendor/qcom/opensource/display",
+ "revision": "android-12.0"
+ },
+ {
+ "remote": "gitlab",
"repository": "android_vendor_qcom_opensource_display-commonsys",
"target_path": "vendor/qcom/opensource/commonsys/display",
"revision": "android-12.0"
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index c3ca149..eb23407 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -152,8 +152,6 @@
vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service
-vendor/bin/hw/vendor.qti.hardware.display.allocator-service
-vendor/bin/hw/vendor.qti.hardware.display.composer-service
vendor/bin/hw/vendor.qti.hardware.eid@1.0-service
vendor/bin/hw/vendor.qti.hardware.factory@1.0-service
vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
@@ -188,7 +186,6 @@
vendor/bin/init.qcom.sh
vendor/bin/init.qcom.usb.sh
vendor/bin/init.qti.chg_policy.sh
-vendor/bin/init.qti.display_boot.sh
vendor/bin/init.qti.kernel.sh
vendor/bin/init.qti.media.sh
vendor/bin/init.qti.qcv.sh
@@ -437,7 +434,6 @@
vendor/etc/init/init.asus.thermald.rc
vendor/etc/init/init.asus.widevine.rc
vendor/etc/init/init.goodixfp.rc
-vendor/etc/init/init.qti.display_boot.rc
vendor/etc/init/init.qti.fm.rc
vendor/etc/init/init.qti.media.rc
vendor/etc/init/init.qti.qcv.rc
@@ -476,8 +472,6 @@
vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc
-vendor/etc/init/vendor.qti.hardware.display.allocator-service.rc
-vendor/etc/init/vendor.qti.hardware.display.composer-service.rc
vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.eid@1.0-service.rc
vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc
@@ -1034,31 +1028,6 @@
vendor/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/7_version_update_ecc_table_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/8_version_update_ecc_table.sql
-vendor/etc/qdcm_calib_data_Dual_nt35597_cmd_mode_dsi_truly_panel_without_DSC.xml
-vendor/etc/qdcm_calib_data_Dual_nt35597_video_mode_dsi_truly_panel_without_DSC.xml
-vendor/etc/qdcm_calib_data_Sharp_2k_cmd_mode_qsync_dsi_panel.xml
-vendor/etc/qdcm_calib_data_Sharp_2k_video_mode_qsync_dsi_panel.xml
-vendor/etc/qdcm_calib_data_Sharp_4k_cmd_mode_dsc_dsi_panel.xml
-vendor/etc/qdcm_calib_data_Sharp_4k_video_mode_dsc_dsi_panel.xml
-vendor/etc/qdcm_calib_data_Sharp_fhd_cmd_mode_qsync_dsi_panel.xml
-vendor/etc/qdcm_calib_data_Sharp_fhd_video_mode_qsync_dsi_panel.xml
-vendor/etc/qdcm_calib_data_Sharp_qhd_cmd_mode_dsi_panel.xml
-vendor/etc/qdcm_calib_data_nt35597_cmd_mode_dsi_truly_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_nt35597_video_mode_dsi_truly_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_nt35695b_truly_fhd_command_mode_dsi_panel.xml
-vendor/etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.xml
-vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_120Hz_Video_panel.xml
-vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_144Hz_video_panel.xml
-vendor/etc/qdcm_calib_data_r66451_amoled_cmd_mode_dsi_visionox_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_r66451_amoled_video_mode_dsi_visionox_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_rm69299_amoled_fhd+_cmd_mode_dsi_visionox_panel.xml
-vendor/etc/qdcm_calib_data_rm69299_amoled_fhd+_video_mode_dsi_visionox_panel.xml
-vendor/etc/qdcm_calib_data_sharp_1080p_cmd_mode_dsi_panel.xml
-vendor/etc/qdcm_calib_data_sw43404_amoled_boe_fhd+_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_sw43404_amoled_cmd_mode_dsi_boe_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_sw43404_amoled_video_mode_dsi_boe_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_td4330_v2_cmd_mode_dsi_truly_panel.xml
-vendor/etc/qdcm_calib_data_td4330_v2_video_mode_dsi_truly_panel.xml
vendor/etc/qxdm/ChgPD.cfg
vendor/etc/qxdm/DIAG_GEN9_GPS.cfg
vendor/etc/qxdm/DIAG_GEN9_GPS_SAP.cfg
@@ -1164,7 +1133,6 @@
vendor/etc/usb_audio_policy_configuration.xml
vendor/etc/video_system_specs.json
-vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
--vendor/etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml
-vendor/etc/vintf/manifest/android.hardware.lights-qti.xml
-vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
-vendor/etc/vintf/manifest/android.hardware.sensors@2.0-multihal.xml
@@ -1177,8 +1145,6 @@
-vendor/etc/vintf/manifest/vendor.pixelworks.hardware.feature.irisfeature-service.xml
-vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml
-vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml
--vendor/etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml
--vendor/etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml
-vendor/etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml
vendor/etc/vmmgr.conf
vendor/etc/wfdconfig.xml
@@ -1645,8 +1611,6 @@
vendor/lib/hw/android.hardware.camera.provider@2.4-impl.so
vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so
vendor/lib/hw/android.hardware.gnss@2.1-impl-qti.so
-vendor/lib/hw/android.hardware.graphics.mapper@3.0-impl-qti-display.so
-vendor/lib/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so
vendor/lib/hw/android.hardware.renderscript@1.0-impl.so
vendor/lib/hw/android.hardware.soundtrigger@2.1-impl.so
vendor/lib/hw/android.hardware.soundtrigger@2.2-impl.so
@@ -1659,10 +1623,7 @@
vendor/lib/hw/camera.qcom.so
vendor/lib/hw/com.dsi.ant@1.0-impl.so
vendor/lib/hw/com.qti.chi.override.so
-vendor/lib/hw/gralloc.default.so
-vendor/lib/hw/lights.qcom.so
vendor/lib/hw/local_time.default.so
-vendor/lib/hw/memtrack.default.so
vendor/lib/hw/power.default.so
vendor/lib/hw/sound_trigger.primary.lahaina.so
vendor/lib/hw/vendor.qti.esepowermanager@1.1-impl.so
@@ -1822,17 +1783,13 @@
vendor/lib/libdiagjni.so
vendor/lib/libdiracgefwrapper.so
vendor/lib/libdisp-aba.so
-vendor/lib/libdisplayconfig.qti.so
-vendor/lib/libdisplaydebug.so
vendor/lib/libdisplayqos.so
vendor/lib/libdisplayskuutils.so
vendor/lib/libdpmqmihal.so
vendor/lib/libdpps.so
vendor/lib/libdrc.so
-vendor/lib/libdrm.so
vendor/lib/libdrmfs.so
vendor/lib/libdrmtime.so
-vendor/lib/libdrmutils.so
vendor/lib/libdsd2pcm.so
vendor/lib/libdsi_netctrl.so
vendor/lib/libdsutils.so
@@ -1850,11 +1807,7 @@
vendor/lib/libgnss.so
vendor/lib/libgnsspps.so
vendor/lib/libgps.utils.so
-vendor/lib/libgpu_tonemapper.so
vendor/lib/libgpudataproducer.so
-vendor/lib/libgralloc.qti.so
-vendor/lib/libgralloccore.so
-vendor/lib/libgrallocutils.so
vendor/lib/libgsl.so
vendor/lib/libhdcp1prov.so
vendor/lib/libhdcp2p2prov.so
@@ -1894,7 +1847,6 @@
vendor/lib/libmctfengine_stub.so
vendor/lib/libmdmdetect.so
vendor/lib/libmdsprpc.so
-vendor/lib/libmemutils.so
vendor/lib/libmfec.so
vendor/lib/libminkdescriptor.so
vendor/lib/libminksocket.so
@@ -1975,7 +1927,6 @@
vendor/lib/libqcrilNrQtiBus.so
vendor/lib/libqcrilNrQtiMutex.so
vendor/lib/libqcrildatactl.so
-vendor/lib/libqdMetaData.so
vendor/lib/libqdcm-mode-parser.so
vendor/lib/libqdi.so
vendor/lib/libqdp.so
@@ -1997,7 +1948,6 @@
vendor/lib/libqrtrclient.so
vendor/lib/libqsap_sdk.so
vendor/lib/libqseed3.so
-vendor/lib/libqservice.so
vendor/lib/libqsocket.so
vendor/lib/libqtbase.so
vendor/lib/libqti-iopd-client-vendor.so
@@ -2038,14 +1988,11 @@
vendor/lib/libscveObjectSegmentation_stub.so
vendor/lib/libscveObjectTracker.so
vendor/lib/libscveObjectTracker_stub.so
-vendor/lib/libsdedrm.so
vendor/lib/libsdm-color.so
vendor/lib/libsdm-colormgr-algo.so
vendor/lib/libsdm-diag.so
vendor/lib/libsdm-disp-vndapis.so
-vendor/lib/libsdmcore.so
vendor/lib/libsdmextension.so
-vendor/lib/libsdmutils.so
vendor/lib/libsdsprpc.so
vendor/lib/libsecureui_svcsock.so
vendor/lib/libsensorcal.so
@@ -2222,23 +2169,6 @@
vendor/lib/vendor.display.color@1.3.so
vendor/lib/vendor.display.color@1.4.so
vendor/lib/vendor.display.color@1.5.so
-vendor/lib/vendor.display.config@1.0.so
-vendor/lib/vendor.display.config@1.1.so
-vendor/lib/vendor.display.config@1.10.so
-vendor/lib/vendor.display.config@1.11.so
-vendor/lib/vendor.display.config@1.12.so
-vendor/lib/vendor.display.config@1.13.so
-vendor/lib/vendor.display.config@1.14.so
-vendor/lib/vendor.display.config@1.15.so
-vendor/lib/vendor.display.config@1.2.so
-vendor/lib/vendor.display.config@1.3.so
-vendor/lib/vendor.display.config@1.4.so
-vendor/lib/vendor.display.config@1.5.so
-vendor/lib/vendor.display.config@1.6.so
-vendor/lib/vendor.display.config@1.7.so
-vendor/lib/vendor.display.config@1.8.so
-vendor/lib/vendor.display.config@1.9.so
-vendor/lib/vendor.display.config@2.0.so
vendor/lib/vendor.display.postproc@1.0.so
vendor/lib/vendor.nxp.eventprocessor@1.0.so
vendor/lib/vendor.nxp.nxpese@1.0.so
@@ -2285,18 +2215,6 @@
vendor/lib/vendor.qti.hardware.data.iwlan@1.0.so
vendor/lib/vendor.qti.hardware.data.latency@1.0.so
vendor/lib/vendor.qti.hardware.data.qmi@1.0.so
-vendor/lib/vendor.qti.hardware.display.allocator@1.0.so
-vendor/lib/vendor.qti.hardware.display.allocator@3.0.so
-vendor/lib/vendor.qti.hardware.display.allocator@4.0.so
-vendor/lib/vendor.qti.hardware.display.composer@1.0.so
-vendor/lib/vendor.qti.hardware.display.composer@2.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@1.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@1.1.so
-vendor/lib/vendor.qti.hardware.display.mapper@2.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@3.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@4.0.so
-vendor/lib/vendor.qti.hardware.display.mapperextensions@1.0.so
-vendor/lib/vendor.qti.hardware.display.mapperextensions@1.1.so
vendor/lib/vendor.qti.hardware.dsp@1.0.so
vendor/lib/vendor.qti.hardware.eid@1.0.so
vendor/lib/vendor.qti.hardware.fm@1.0.so
@@ -2544,8 +2462,6 @@
vendor/lib64/hw/android.hardware.camera.provider@2.4-impl.so
vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so
-vendor/lib64/hw/android.hardware.graphics.mapper@3.0-impl-qti-display.so
-vendor/lib64/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so
vendor/lib64/hw/android.hardware.renderscript@1.0-impl.so
vendor/lib64/hw/android.hardware.soundtrigger@2.2-impl.so
vendor/lib64/hw/android.hardware.soundtrigger@2.3-impl.so
@@ -2559,10 +2475,7 @@
vendor/lib64/hw/com.qti.chi.override.so
vendor/lib64/hw/fingerprint.default.so
vendor/lib64/hw/fingerprint_er1.default.so
-vendor/lib64/hw/gralloc.default.so
-vendor/lib64/hw/lights.qcom.so
vendor/lib64/hw/local_time.default.so
-vendor/lib64/hw/memtrack.default.so
vendor/lib64/hw/power.default.so
vendor/lib64/hw/sound_trigger.primary.lahaina.so
vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so
@@ -2735,16 +2648,12 @@
vendor/lib64/libdiag.so
vendor/lib64/libdiagjni.so
vendor/lib64/libdisp-aba.so
-vendor/lib64/libdisplayconfig.qti.so
-vendor/lib64/libdisplaydebug.so
vendor/lib64/libdisplayqos.so
vendor/lib64/libdisplayskuutils.so
vendor/lib64/libdpmqmihal.so
vendor/lib64/libdpps.so
-vendor/lib64/libdrm.so
vendor/lib64/libdrmfs.so
vendor/lib64/libdrmtime.so
-vendor/lib64/libdrmutils.so
vendor/lib64/libdsi_netctrl.so
vendor/lib64/libdsutils.so
vendor/lib64/libembmsservice.so
@@ -2766,11 +2675,7 @@
vendor/lib64/libgnsspps.so
vendor/lib64/libgplaf.so
vendor/lib64/libgps.utils.so
-vendor/lib64/libgpu_tonemapper.so
vendor/lib64/libgpudataproducer.so
-vendor/lib64/libgralloc.qti.so
-vendor/lib64/libgralloccore.so
-vendor/lib64/libgrallocutils.so
vendor/lib64/libgsl.so
vendor/lib64/libhdcp1prov.so
vendor/lib64/libhdcp2p2prov.so
@@ -2816,7 +2721,6 @@
vendor/lib64/libmdmdetect.so
vendor/lib64/libmdsprpc.so
vendor/lib64/libmemperfd.so
-vendor/lib64/libmemutils.so
vendor/lib64/libmeters-ns.so
vendor/lib64/libmeters.so
vendor/lib64/libmfec.so
@@ -2902,7 +2806,6 @@
vendor/lib64/libqcrilNrQtiBus.so
vendor/lib64/libqcrilNrQtiMutex.so
vendor/lib64/libqcrildatactl.so
-vendor/lib64/libqdMetaData.so
vendor/lib64/libqdcm-mode-parser.so
vendor/lib64/libqdi.so
vendor/lib64/libqdp.so
@@ -2925,7 +2828,6 @@
vendor/lib64/libqrtrclient.so
vendor/lib64/libqsap_sdk.so
vendor/lib64/libqseed3.so
-vendor/lib64/libqservice.so
vendor/lib64/libqsocket.so
vendor/lib64/libqtbase.so
vendor/lib64/libqti-iopd-client-vendor.so
@@ -2967,14 +2869,11 @@
vendor/lib64/libscveObjectSegmentation_stub.so
vendor/lib64/libscveObjectTracker.so
vendor/lib64/libscveObjectTracker_stub.so
-vendor/lib64/libsdedrm.so
vendor/lib64/libsdm-color.so
vendor/lib64/libsdm-colormgr-algo.so
vendor/lib64/libsdm-diag.so
vendor/lib64/libsdm-disp-vndapis.so
-vendor/lib64/libsdmcore.so
vendor/lib64/libsdmextension.so
-vendor/lib64/libsdmutils.so
vendor/lib64/libsdsprpc.so
vendor/lib64/libsecureui_svcsock.so
vendor/lib64/libsensorcal.so
@@ -3085,23 +2984,6 @@
vendor/lib64/vendor.display.color@1.3.so
vendor/lib64/vendor.display.color@1.4.so
vendor/lib64/vendor.display.color@1.5.so
-vendor/lib64/vendor.display.config@1.0.so
-vendor/lib64/vendor.display.config@1.1.so
-vendor/lib64/vendor.display.config@1.10.so
-vendor/lib64/vendor.display.config@1.11.so
-vendor/lib64/vendor.display.config@1.12.so
-vendor/lib64/vendor.display.config@1.13.so
-vendor/lib64/vendor.display.config@1.14.so
-vendor/lib64/vendor.display.config@1.15.so
-vendor/lib64/vendor.display.config@1.2.so
-vendor/lib64/vendor.display.config@1.3.so
-vendor/lib64/vendor.display.config@1.4.so
-vendor/lib64/vendor.display.config@1.5.so
-vendor/lib64/vendor.display.config@1.6.so
-vendor/lib64/vendor.display.config@1.7.so
-vendor/lib64/vendor.display.config@1.8.so
-vendor/lib64/vendor.display.config@1.9.so
-vendor/lib64/vendor.display.config@2.0.so
vendor/lib64/vendor.display.postproc@1.0.so
vendor/lib64/vendor.nxp.eventprocessor@1.0.so
vendor/lib64/vendor.nxp.nxpese@1.0.so
@@ -3148,19 +3030,6 @@
vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so
vendor/lib64/vendor.qti.hardware.data.latency@1.0.so
vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so
-vendor/lib64/vendor.qti.hardware.display.allocator@1.0.so
-vendor/lib64/vendor.qti.hardware.display.allocator@3.0.so
-vendor/lib64/vendor.qti.hardware.display.allocator@4.0.so
-vendor/lib64/vendor.qti.hardware.display.composer@1.0.so
-vendor/lib64/vendor.qti.hardware.display.composer@2.0.so
-vendor/lib64/vendor.qti.hardware.display.composer@3.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@1.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@1.1.so
-vendor/lib64/vendor.qti.hardware.display.mapper@2.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@3.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@4.0.so
-vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.0.so
-vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.1.so
vendor/lib64/vendor.qti.hardware.dsp@1.0.so
vendor/lib64/vendor.qti.hardware.eid@1.0.so
vendor/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so
diff --git a/regen-vendor.sh b/regen-vendor.sh
index ef2a3c4..2786db3 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -468,6 +468,139 @@
"etc/group"
"etc/passwd"
+ # Display
+ "bin/init.qti.display_boot.sh"
+ "etc/init/init.qti.display_boot.rc"
+ "lib/libqdMetaData.so"
+ "lib64/libqdMetaData.so"
+ "lib/libgralloc.qti.so"
+ "lib64/libgralloc.qti.so"
+ "lib/libdisplayconfig.qti.so"
+ "lib64/libdisplayconfig.qti.so"
+ "lib/vendor.qti.hardware.display.allocator@1.0.so"
+ "lib/vendor.qti.hardware.display.allocator@3.0.so"
+ "lib/vendor.qti.hardware.display.allocator@4.0.so"
+ "lib/vendor.qti.hardware.display.composer@1.0.so"
+ "lib/vendor.qti.hardware.display.composer@2.0.so"
+ "lib/vendor.qti.hardware.display.mapper@1.0.so"
+ "lib/vendor.qti.hardware.display.mapper@1.1.so"
+ "lib/vendor.qti.hardware.display.mapper@2.0.so"
+ "lib/vendor.qti.hardware.display.mapper@3.0.so"
+ "lib/vendor.qti.hardware.display.mapper@4.0.so"
+ "lib/vendor.qti.hardware.display.mapperextensions@1.0.so"
+ "lib/vendor.qti.hardware.display.mapperextensions@1.1.so"
+ "lib64/vendor.qti.hardware.display.allocator@1.0.so"
+ "lib64/vendor.qti.hardware.display.allocator@3.0.so"
+ "lib64/vendor.qti.hardware.display.allocator@4.0.so"
+ "lib64/vendor.qti.hardware.display.composer@1.0.so"
+ "lib64/vendor.qti.hardware.display.composer@2.0.so"
+ "lib64/vendor.qti.hardware.display.composer@3.0.so"
+ "lib64/vendor.qti.hardware.display.mapper@1.0.so"
+ "lib64/vendor.qti.hardware.display.mapper@1.1.so"
+ "lib64/vendor.qti.hardware.display.mapper@2.0.so"
+ "lib64/vendor.qti.hardware.display.mapper@3.0.so"
+ "lib64/vendor.qti.hardware.display.mapper@4.0.so"
+ "lib64/vendor.qti.hardware.display.mapperextensions@1.0.so"
+ "lib64/vendor.qti.hardware.display.mapperextensions@1.1.so"
+ "lib/vendor.display.config@1.0.so"
+ "lib/vendor.display.config@1.1.so"
+ "lib/vendor.display.config@1.10.so"
+ "lib/vendor.display.config@1.11.so"
+ "lib/vendor.display.config@1.12.so"
+ "lib/vendor.display.config@1.13.so"
+ "lib/vendor.display.config@1.14.so"
+ "lib/vendor.display.config@1.15.so"
+ "lib/vendor.display.config@1.2.so"
+ "lib/vendor.display.config@1.3.so"
+ "lib/vendor.display.config@1.4.so"
+ "lib/vendor.display.config@1.5.so"
+ "lib/vendor.display.config@1.6.so"
+ "lib/vendor.display.config@1.7.so"
+ "lib/vendor.display.config@1.8.so"
+ "lib/vendor.display.config@1.9.so"
+ "lib/vendor.display.config@2.0.so"
+ "lib64/vendor.display.config@1.0.so"
+ "lib64/vendor.display.config@1.1.so"
+ "lib64/vendor.display.config@1.10.so"
+ "lib64/vendor.display.config@1.11.so"
+ "lib64/vendor.display.config@1.12.so"
+ "lib64/vendor.display.config@1.13.so"
+ "lib64/vendor.display.config@1.14.so"
+ "lib64/vendor.display.config@1.15.so"
+ "lib64/vendor.display.config@1.2.so"
+ "lib64/vendor.display.config@1.3.so"
+ "lib64/vendor.display.config@1.4.so"
+ "lib64/vendor.display.config@1.5.so"
+ "lib64/vendor.display.config@1.6.so"
+ "lib64/vendor.display.config@1.7.so"
+ "lib64/vendor.display.config@1.8.so"
+ "lib64/vendor.display.config@1.9.so"
+ "lib64/vendor.display.config@2.0.so"
+ "bin/hw/vendor.qti.hardware.display.composer-service"
+ "etc/init/vendor.qti.hardware.display.composer-service.rc"
+ "etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml"
+ "bin/hw/vendor.qti.hardware.display.allocator-service"
+ "etc/init/vendor.qti.hardware.display.allocator-service.rc"
+ "etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml"
+ "lib/libsdmcore.so"
+ "lib64/libsdmcore.so"
+ "lib/libsdmutils.so"
+ "lib64/libsdmutils.so"
+ "lib/hw/memtrack.default.so"
+ "lib64/hw/memtrack.default.so"
+ "etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml"
+ "lib/hw/android.hardware.graphics.mapper@3.0-impl-qti-display.so"
+ "lib/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so"
+ "lib64/hw/android.hardware.graphics.mapper@3.0-impl-qti-display.so"
+ "lib64/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so"
+ "etc/qdcm_calib_data_Dual_nt35597_cmd_mode_dsi_truly_panel_without_DSC.xml"
+ "etc/qdcm_calib_data_Dual_nt35597_video_mode_dsi_truly_panel_without_DSC.xml"
+ "etc/qdcm_calib_data_Sharp_2k_cmd_mode_qsync_dsi_panel.xml"
+ "etc/qdcm_calib_data_Sharp_2k_video_mode_qsync_dsi_panel.xml"
+ "etc/qdcm_calib_data_Sharp_4k_cmd_mode_dsc_dsi_panel.xml"
+ "etc/qdcm_calib_data_Sharp_4k_video_mode_dsc_dsi_panel.xml"
+ "etc/qdcm_calib_data_Sharp_fhd_cmd_mode_qsync_dsi_panel.xml"
+ "etc/qdcm_calib_data_Sharp_fhd_video_mode_qsync_dsi_panel.xml"
+ "etc/qdcm_calib_data_Sharp_qhd_cmd_mode_dsi_panel.xml"
+ "etc/qdcm_calib_data_nt35597_cmd_mode_dsi_truly_panel_with_DSC.xml"
+ "etc/qdcm_calib_data_nt35597_video_mode_dsi_truly_panel_with_DSC.xml"
+ "etc/qdcm_calib_data_nt35695b_truly_fhd_command_mode_dsi_panel.xml"
+ "etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.xml"
+ "etc/qdcm_calib_data_nt36672e_fhd_plus_120Hz_Video_panel.xml"
+ "etc/qdcm_calib_data_nt36672e_fhd_plus_144Hz_video_panel.xml"
+ "etc/qdcm_calib_data_r66451_amoled_cmd_mode_dsi_visionox_panel_with_DSC.xml"
+ "etc/qdcm_calib_data_r66451_amoled_video_mode_dsi_visionox_panel_with_DSC.xml"
+ "etc/qdcm_calib_data_rm69299_amoled_fhd+_cmd_mode_dsi_visionox_panel.xml"
+ "etc/qdcm_calib_data_rm69299_amoled_fhd+_video_mode_dsi_visionox_panel.xml"
+ "etc/qdcm_calib_data_sharp_1080p_cmd_mode_dsi_panel.xml"
+ "etc/qdcm_calib_data_sw43404_amoled_boe_fhd+_panel_with_DSC.xml"
+ "etc/qdcm_calib_data_sw43404_amoled_cmd_mode_dsi_boe_panel_with_DSC.xml"
+ "etc/qdcm_calib_data_sw43404_amoled_video_mode_dsi_boe_panel_with_DSC.xml"
+ "etc/qdcm_calib_data_td4330_v2_cmd_mode_dsi_truly_panel.xml"
+ "etc/qdcm_calib_data_td4330_v2_video_mode_dsi_truly_panel.xml"
+ "lib/libmemutils.so"
+ "lib64/libmemutils.so"
+ "lib/libdrm.so"
+ "lib64/libdrm.so"
+ "lib/libdrmutils.so"
+ "lib64/libdrmutils.so"
+ "lib/libsdedrm.so"
+ "lib64/libsdedrm.so"
+ "lib/libdisplaydebug.so"
+ "lib64/libdisplaydebug.so"
+ "lib/libgralloccore.so"
+ "lib64/libgralloccore.so"
+ "lib/libgrallocutils.so"
+ "lib64/libgrallocutils.so"
+ "lib/hw/gralloc.default.so"
+ "lib64/hw/gralloc.default.so"
+ "lib/libqservice.so"
+ "lib64/libqservice.so"
+ "lib/libgpu_tonemapper.so"
+ "lib64/libgpu_tonemapper.so"
+ "lib/hw/lights.qcom.so"
+ "lib64/hw/lights.qcom.so"
+
# fstab
"etc/fstab.default"
"etc/fstab.emmc"
@@ -1166,7 +1299,6 @@
presign "app/com.qualcomm.qti.gpudrivers.lahaina.api30/com.qualcomm.qti.gpudrivers.lahaina.api30.apk"
as_module "etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml"
-as_module "etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml"
as_module "etc/vintf/manifest/android.hardware.lights-qti.xml"
as_module "etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml"
as_module "etc/vintf/manifest/android.hardware.sensors@2.0-multihal.xml"
@@ -1179,7 +1311,4 @@
as_module "etc/vintf/manifest/vendor.pixelworks.hardware.feature.irisfeature-service.xml"
as_module "etc/vintf/manifest/vendor.qti.diag.hal.service.xml"
as_module "etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml"
-as_module "etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml"
-as_module "etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml"
as_module "etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml"
-
diff --git a/vendor.prop b/vendor.prop
index bace12c..0d59570 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -134,33 +134,6 @@
persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=true
persist.vendor.qcom.bluetooth.aptxadaptiver2_1_support=true
persist.sys.fflag.override.settings_bluetooth_hearing_aid=true
-persist.sys.sf.color_mode=9
-persist.demo.hdmirotationlock=false
-persist.sys.sf.color_saturation=1.0
-debug.sf.hw=0
-debug.egl.hw=0
-debug.sf.latch_unsignaled=1
-debug.sf.high_fps_late_app_phase_offset_ns=1000000
-debug.mdpcomp.logs=0
-vendor.gralloc.disable_ubwc=0
-vendor.display.disable_scaler=0
-vendor.display.disable_excl_rect=0
-vendor.display.disable_excl_rect_partial_fb=1
-vendor.display.comp_mask=0
-vendor.display.enable_optimize_refresh=1
-vendor.display.use_smooth_motion=1
-debug.sf.enable_advanced_sf_phase_offset=1
-debug.sf.high_fps_late_sf_phase_offset_ns=-4000000
-debug.sf.high_fps_early_phase_offset_ns=-4000000
-debug.sf.high_fps_early_gl_phase_offset_ns=-4000000
-debug.sf.disable_client_composition_cache=1
-debug.sf.enable_gl_backpressure=0
-debug.sf.disable_backpressure=1
-vendor.display.disable_offline_rotator=1
-vendor.display.enable_async_powermode=0
-vendor.display.disable_hw_recovery_dump=1
-vendor.display.enable_early_wakeup=1
-persist.vendor.dpmhalservice.enable=1
ro.crypto.dm_default_key.options_format.version=2
ro.crypto.volume.metadata.method=dm-default-key
debug.stagefright.c2inputsurface=-1