zenfone9: Switch to Omni compat
Change-Id: I98dbfd2ec1cc977a979655b796e6a022a0b99558
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4bf9f95..6a5a38b 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -237,9 +237,6 @@
BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
-# VNDK
-NEED_AIDL_NDK_PLATFORM_BACKEND := true
-
# WiFi
BOARD_WLAN_DEVICE := qcwcn
BOARD_HOSTAPD_DRIVER := NL80211
diff --git a/device.mk b/device.mk
index 97a3a6a..b2d0714 100755
--- a/device.mk
+++ b/device.mk
@@ -208,6 +208,7 @@
# Keymint
PRODUCT_PACKAGES += \
android.hardware.security.keymint-V1-ndk_platform.vendor \
+ android.hardware.security.secureclock-V1-ndk_platform.vendor \
android.hardware.security.sharedsecret-V1-ndk_platform.vendor \
android.hardware.security.rkp-V1-ndk.vendor
@@ -353,10 +354,13 @@
vendor.qti.hardware.vibrator.service
# VNDK
-PRODUCT_EXTRA_VNDK_VERSIONS := 30 31 32
-
-PRODUCT_COPY_FILES += \
- prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhidlbase-v32.so
+PRODUCT_PACKAGES += \
+ libhidlbase-v32.vendor \
+ libhidlbase_shim \
+ android.hardware.common-V2-ndk_platform.vendor \
+ android.hardware.keymaster-V3-ndk_platform.vendor \
+ android.hardware.memtrack-V1-ndk_platform.vendor \
+ android.hardware.neuralnetworks-V1-ndk_platform.vendor
# Wifi
PRODUCT_PACKAGES += \
diff --git a/extract-files.py b/extract-files.py
index 0ac2e26..aec4425 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -36,7 +36,8 @@
.regex_replace('xml version="2.0"', 'xml version="1.0"'),
'vendor/bin/vendor.dpmd': blob_fixup()
.add_needed('libhidlbase_shim.so'),
- 'vendor/bin/hw/android.hardware.security.keymint-service-qti': blob_fixup()
+ ('vendor/bin/hw/android.hardware.security.keymint-service-qti',
+ 'vendor/lib64/libqtikeymint.so'): blob_fixup()
.add_needed('android.hardware.security.rkp-V1-ndk.so'),
('vendor/etc/media_codecs_cape.xml', 'vendor/etc/media_codecs_cape_vendor.xml'): blob_fixup()
.regex_replace('.*media_codecs_(google_audio|google_c2|google_telephony|google_video|vendor_audio).*\n', ''),
@@ -46,6 +47,9 @@
.add_line_if_missing('gettid: 1'),
'vendor/lib64/libQnnGpu.so': blob_fixup()
.strip_debug_sections(),
+ ('vendor/lib/libcamximageformatutils.so',
+ 'vendor/lib64/libcamximageformatutils.so'): blob_fixup()
+ .replace_needed('vendor.qti.hardware.display.config-V2-ndk_platform.so', 'vendor.qti.hardware.display.config-V2-ndk.so'),
'vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so': blob_fixup()
.remove_needed('libhidltransport.so')
.replace_needed('libhidlbase.so', 'libhidlbase-v32.so'),
diff --git a/libhidl/Android.bp b/libhidl/Android.bp
deleted file mode 100644
index e01649f..0000000
--- a/libhidl/Android.bp
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// Copyright (C) 2022 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-cc_library_shared {
- name: "android.hidl.base@1.0",
- shared_libs: ["libhidlbase"],
- system_ext_specific: true,
- vendor_available: true,
-}
diff --git a/omni.dependencies b/omni.dependencies
index 0cc5c5f..ceca211 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -18,7 +18,13 @@
"override": "platform/external/tinycompress",
"revision": "android-14.0"
},
- {
+ {
+ "remote": "gitlab",
+ "repository": "android_hardware_omni_compat",
+ "target_path": "hardware/omni/compat",
+ "revision": "android-15"
+ },
+ {
"remote": "omnirom",
"repository": "android_hardware_qcom_bootctrl",
"target_path": "hardware/qcom/bootctrl",