davinci: Disable NFC for indian devices

* Setup davinci sku when device is global or chinese.
* Move the nfc manifest entry to davinci hardware sku
  variant.

Change-Id: I76ac75cd80f85efa6dfa68753602d934a11000a3
Signed-off-by: Arian <arian.kulmer@web.de>
This commit is contained in:
Erfan Abdi
2020-07-25 16:15:59 +04:30
committed by Arian
parent 1c5c53d034
commit 6e3b2395f6
4 changed files with 31 additions and 20 deletions

View File

@@ -98,6 +98,9 @@ LOC_HIDL_VERSION := 3.0
# HIDL # HIDL
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/hidl/manifest.xml DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/hidl/manifest.xml
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/compatibility_matrix.xml DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/compatibility_matrix.xml
ODM_MANIFEST_SKUS += davinci
ODM_MANIFEST_DAVINCI_FILES := \
$(DEVICE_PATH)/configs/hidl/manifest-nfc.xml
# Init # Init
TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_davinci TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_davinci

View File

@@ -0,0 +1,22 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
<fqname>@1.2::INfc/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.nxp.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INqNfc</name>
<instance>default</instance>
</interface>
<fqname>@1.2::INqNfc/default</fqname>
</hal>
</manifest>

View File

@@ -223,16 +223,6 @@
<fqname>@1.2::IDevice/qti-gpu</fqname> <fqname>@1.2::IDevice/qti-gpu</fqname>
<fqname>@1.2::IDevice/qti-hta</fqname> <fqname>@1.2::IDevice/qti-hta</fqname>
</hal> </hal>
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
<fqname>@1.2::INfc/default</fqname>
</hal>
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.power</name> <name>android.hardware.power</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>
@@ -449,16 +439,6 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl">
<name>vendor.nxp.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INqNfc</name>
<instance>default</instance>
</interface>
<fqname>@1.2::INqNfc/default</fqname>
</hal>
<hal format="hidl"> <hal format="hidl">
<name>vendor.qti.data.factory</name> <name>vendor.qti.data.factory</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>

View File

@@ -59,6 +59,12 @@ on init
chmod 0660 /dev/drv8846_dev chmod 0660 /dev/drv8846_dev
chmod 0660 /dev/akm09970 chmod 0660 /dev/akm09970
on init && property:ro.boot.hwc=GLOBAL
setprop ro.boot.product.hardware.sku davinci
on init && property:ro.boot.hwc=CN
setprop ro.boot.product.hardware.sku davinci
on fs on fs
mount_all /vendor/etc/fstab.qcom --early mount_all /vendor/etc/fstab.qcom --early