From 057daefb66db49723fb82ebebe36a621cb3a1b2a Mon Sep 17 00:00:00 2001 From: Arian Date: Wed, 2 Mar 2022 18:59:50 +0100 Subject: [PATCH] sm8350-common: Move vendor manifest fragments to vendor repository Change-Id: I8770fb6c27637dfa934af45a3993c4447dcd2430 --- BoardConfigCommon.mk | 11 +--- extract-files.sh | 4 ++ hidl/android.hardware.atrace@1.0-service.xml | 11 ---- hidl/android.hardware.boot@1.1.xml | 7 --- .../android.hardware.gnss@2.1-service-qti.xml | 36 ----------- ...ardware.neuralnetworks@1.3-service-qti.xml | 14 ----- hidl/c2_manifest_vendor.xml | 40 ------------ hidl/fod.xml | 61 ------------------- ...roid.hardware.drm@1.3-service.widevine.xml | 23 ------- hidl/vendor.qti.diag.hal.service.xml | 17 ------ hidl/vendor.qti.gnss@4.0-service.xml | 19 ------ ...ti.hardware.servicetracker@1.2-service.xml | 16 ----- proprietary-files.txt | 11 ++++ 13 files changed, 16 insertions(+), 254 deletions(-) delete mode 100644 hidl/android.hardware.atrace@1.0-service.xml delete mode 100644 hidl/android.hardware.boot@1.1.xml delete mode 100644 hidl/android.hardware.gnss@2.1-service-qti.xml delete mode 100644 hidl/android.hardware.neuralnetworks@1.3-service-qti.xml delete mode 100644 hidl/c2_manifest_vendor.xml delete mode 100644 hidl/fod.xml delete mode 100644 hidl/manifest_android.hardware.drm@1.3-service.widevine.xml delete mode 100644 hidl/vendor.qti.diag.hal.service.xml delete mode 100644 hidl/vendor.qti.gnss@4.0-service.xml delete mode 100644 hidl/vendor.qti.hardware.servicetracker@1.2-service.xml diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f2c8d40..74f9a8c 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -106,16 +106,7 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ DEVICE_MANIFEST_FILE := \ $(COMMON_PATH)/hidl/manifest_lahaina.xml \ $(COMMON_PATH)/hidl/manifest_lineage.xml \ - $(COMMON_PATH)/hidl/manifest_xiaomi.xml \ - $(COMMON_PATH)/hidl/android.hardware.atrace@1.0-service.xml \ - $(COMMON_PATH)/hidl/android.hardware.gnss@2.1-service-qti.xml \ - $(COMMON_PATH)/hidl/android.hardware.neuralnetworks@1.3-service-qti.xml \ - $(COMMON_PATH)/hidl/c2_manifest_vendor.xml \ - $(COMMON_PATH)/hidl/fod.xml \ - $(COMMON_PATH)/hidl/manifest_android.hardware.drm@1.3-service.widevine.xml \ - $(COMMON_PATH)/hidl/vendor.qti.diag.hal.service.xml \ - $(COMMON_PATH)/hidl/vendor.qti.gnss@4.0-service.xml \ - $(COMMON_PATH)/hidl/vendor.qti.hardware.servicetracker@1.2-service.xml + $(COMMON_PATH)/hidl/manifest_xiaomi.xml # Partitions BOARD_FLASH_BLOCK_SIZE := 131072 diff --git a/extract-files.sh b/extract-files.sh index b0b6ea7..ec47e13 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -63,6 +63,10 @@ function blob_fixup() { product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml | product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml) sed -i 's/version="2.0"/version="1.0"/g' "${2}" ;; + vendor/etc/vintf/manifest/c2_manifest_vendor.xml) + sed -ni '/ozoaudio/!p' "${2}" + sed -ni '/dolby/!p' "${2}" + ;; esac } diff --git a/hidl/android.hardware.atrace@1.0-service.xml b/hidl/android.hardware.atrace@1.0-service.xml deleted file mode 100644 index fd3631c..0000000 --- a/hidl/android.hardware.atrace@1.0-service.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - android.hardware.atrace - hwbinder - 1.0 - - IAtraceDevice - default - - - diff --git a/hidl/android.hardware.boot@1.1.xml b/hidl/android.hardware.boot@1.1.xml deleted file mode 100644 index 83d5d2e..0000000 --- a/hidl/android.hardware.boot@1.1.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - android.hardware.boot - hwbinder - @1.1::IBootControl/default - - diff --git a/hidl/android.hardware.gnss@2.1-service-qti.xml b/hidl/android.hardware.gnss@2.1-service-qti.xml deleted file mode 100644 index 842fb6e..0000000 --- a/hidl/android.hardware.gnss@2.1-service-qti.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - android.hardware.gnss - hwbinder - @1.1::IGnss/default - @2.1::IGnss/default - - - diff --git a/hidl/android.hardware.neuralnetworks@1.3-service-qti.xml b/hidl/android.hardware.neuralnetworks@1.3-service-qti.xml deleted file mode 100644 index b49adac..0000000 --- a/hidl/android.hardware.neuralnetworks@1.3-service-qti.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/qti-default - @1.3::IDevice/qti-dsp - @1.3::IDevice/qti-gpu - - diff --git a/hidl/c2_manifest_vendor.xml b/hidl/c2_manifest_vendor.xml deleted file mode 100644 index f6c22c1..0000000 --- a/hidl/c2_manifest_vendor.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - android.hardware.media.c2 - hwbinder - 1.0 - - IComponentStore - default - software - - - diff --git a/hidl/fod.xml b/hidl/fod.xml deleted file mode 100644 index 90d3761..0000000 --- a/hidl/fod.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - vendor.xiaomi.hardware.fingerprintextension - hwbinder - 1.0 - - IXiaomiFingerprint - default - - - - com.fingerprints.extension - hwbinder - 3.0 - - IFingerprintSensorTest - default - - - IFingerprintNavigation - default - - - - vendor.xiaomi.hardware.fx.tunnel - hwbinder - 1.0 - - IMiFxTunnel - default - - - diff --git a/hidl/manifest_android.hardware.drm@1.3-service.widevine.xml b/hidl/manifest_android.hardware.drm@1.3-service.widevine.xml deleted file mode 100644 index f6f2d88..0000000 --- a/hidl/manifest_android.hardware.drm@1.3-service.widevine.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - android.hardware.drm - hwbinder - @1.3::ICryptoFactory/widevine - @1.3::IDrmFactory/widevine - - diff --git a/hidl/vendor.qti.diag.hal.service.xml b/hidl/vendor.qti.diag.hal.service.xml deleted file mode 100644 index c12a367..0000000 --- a/hidl/vendor.qti.diag.hal.service.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - vendor.qti.diaghal - hwbinder - 1.0 - - Idiag - default - - - diff --git a/hidl/vendor.qti.gnss@4.0-service.xml b/hidl/vendor.qti.gnss@4.0-service.xml deleted file mode 100644 index 0ec38c5..0000000 --- a/hidl/vendor.qti.gnss@4.0-service.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - vendor.qti.gnss - hwbinder - @1.2::ILocHidlGnss/gnss_vendor - @2.1::ILocHidlGnss/gnss_vendor - @3.0::ILocHidlGnss/gnss_vendor - @4.0::ILocHidlGnss/gnss_vendor - - - android.hardware.gnss - hwbinder - @1.0::IGnss/gnss_vendor - - diff --git a/hidl/vendor.qti.hardware.servicetracker@1.2-service.xml b/hidl/vendor.qti.hardware.servicetracker@1.2-service.xml deleted file mode 100644 index b685dfe..0000000 --- a/hidl/vendor.qti.hardware.servicetracker@1.2-service.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - vendor.qti.hardware.servicetracker - hwbinder - 1.2 - - IServicetracker - default - - - diff --git a/proprietary-files.txt b/proprietary-files.txt index 8798576..9810a4e 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -643,6 +643,17 @@ product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml product/etc/public.libraries-qti.txt product/etc/security/fsverity/play_store_fsi_cert.der +# Manifest fragments +-vendor/etc/vintf/manifest/android.hardware.atrace@1.0-service.xml +-vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml +-vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml +-vendor/etc/vintf/manifest/c2_manifest_vendor.xml +-vendor/etc/vintf/manifest/fod.xml +-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.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.servicetracker@1.2-service.xml + # vendor -vendor/app/CACertService/CACertService.apk -vendor/app/CneApp/CneApp.apk