sm8350-common: Move vendor manifest fragments to vendor repository

Change-Id: I8770fb6c27637dfa934af45a3993c4447dcd2430
This commit is contained in:
Arian 2022-03-02 18:59:50 +01:00
parent 2eb8ab7ef0
commit 057daefb66
13 changed files with 16 additions and 254 deletions

View File

@ -106,16 +106,7 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
DEVICE_MANIFEST_FILE := \ DEVICE_MANIFEST_FILE := \
$(COMMON_PATH)/hidl/manifest_lahaina.xml \ $(COMMON_PATH)/hidl/manifest_lahaina.xml \
$(COMMON_PATH)/hidl/manifest_lineage.xml \ $(COMMON_PATH)/hidl/manifest_lineage.xml \
$(COMMON_PATH)/hidl/manifest_xiaomi.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
# Partitions # Partitions
BOARD_FLASH_BLOCK_SIZE := 131072 BOARD_FLASH_BLOCK_SIZE := 131072

View File

@ -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) 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}" 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 esac
} }

View File

@ -1,11 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.atrace</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IAtraceDevice</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View File

@ -1,7 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.boot</name>
<transport>hwbinder</transport>
<fqname>@1.1::IBootControl/default</fqname>
</hal>
</manifest>

View File

@ -1,36 +0,0 @@
<!-- Copyright (c) 2020, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of The Linux Foundation nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.gnss</name>
<transport>hwbinder</transport>
<fqname>@1.1::IGnss/default</fqname>
<fqname>@2.1::IGnss/default</fqname>
</hal>
</manifest>

View File

@ -1,14 +0,0 @@
<!--
Copyright (c) 2020 Qualcomm Technologies, Inc.
All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc.
-->
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<fqname>@1.3::IDevice/qti-default</fqname>
<fqname>@1.3::IDevice/qti-dsp</fqname>
<fqname>@1.3::IDevice/qti-gpu</fqname>
</hal>
</manifest>

View File

@ -1,40 +0,0 @@
<!-- Copyright (c) 2018 - 2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of The Linux Foundation nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<manifest version="1.0" type="device">
<!-- Codec2 HAl service -->
<hal format="hidl">
<name>android.hardware.media.c2</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IComponentStore</name>
<instance>default</instance>
<instance>software</instance>
</interface>
</hal>
</manifest>

View File

@ -1,61 +0,0 @@
<!-- Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of The Linux Foundation nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<manifest version="1.0" type="device">
<!-- xiaomi fod service-->
<hal format="hidl">
<name>vendor.xiaomi.hardware.fingerprintextension</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IXiaomiFingerprint</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>com.fingerprints.extension</name>
<transport>hwbinder</transport>
<version>3.0</version>
<interface>
<name>IFingerprintSensorTest</name>
<instance>default</instance>
</interface>
<interface>
<name>IFingerprintNavigation</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.xiaomi.hardware.fx.tunnel</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IMiFxTunnel</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.drm</name>
<transport>hwbinder</transport>
<fqname>@1.3::ICryptoFactory/widevine</fqname>
<fqname>@1.3::IDrmFactory/widevine</fqname>
</hal>
</manifest>

View File

@ -1,17 +0,0 @@
<!--
Copyright (c) 2020 Qualcomm Technologies, Inc.
All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc.
-->
<manifest version="1.0" type="device">
<!-- DIAG-HAL service-->
<hal format="hidl">
<name>vendor.qti.diaghal</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>Idiag</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View File

@ -1,19 +0,0 @@
<!-- Copyright (c) 2020 Qualcomm Technologies, Inc.
All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc.
-->
<manifest version="1.0" type="device">
<hal format="hidl">
<name>vendor.qti.gnss</name>
<transport>hwbinder</transport>
<fqname>@1.2::ILocHidlGnss/gnss_vendor</fqname>
<fqname>@2.1::ILocHidlGnss/gnss_vendor</fqname>
<fqname>@3.0::ILocHidlGnss/gnss_vendor</fqname>
<fqname>@4.0::ILocHidlGnss/gnss_vendor</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.gnss</name>
<transport>hwbinder</transport>
<fqname>@1.0::IGnss/gnss_vendor</fqname>
</hal>
</manifest>

View File

@ -1,16 +0,0 @@
<!--
Copyright (c) 2020 Qualcomm Technologies, Inc.
All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc.
-->
<manifest version="1.0" type="device">
<hal format="hidl">
<name>vendor.qti.hardware.servicetracker</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>IServicetracker</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View File

@ -643,6 +643,17 @@ product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml
product/etc/public.libraries-qti.txt product/etc/public.libraries-qti.txt
product/etc/security/fsverity/play_store_fsi_cert.der 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
-vendor/app/CACertService/CACertService.apk -vendor/app/CACertService/CACertService.apk
-vendor/app/CneApp/CneApp.apk -vendor/app/CneApp/CneApp.apk