berlna: Move nfc config to vendor

Change-Id: If0db1fecd8a2d415073d75ef3df79ad4d4a6d8c4

device.mk

@@ -49,7 +49,6 @@ PRODUCT_PACKAGES += \
     init.ets.rc \
     init.mmi.overlay.rc \
     init.recovery.berlna.rc \
-    init.vendor.st21nfc.rc \
     init.oem.fingerprint2.sh \
     load_touch.sh.recovery
 
@@ -65,7 +64,7 @@ $(call inherit-product, vendor/motorola/MotCamera4-lahaina/motcamera4.mk)
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc-service.st \
+    android.hardware.nfc@1.2-service.st \
     com.android.nfc_extras \
     Tag
 

extract-files.py

@@ -39,14 +39,7 @@ lib_fixups: lib_fixups_user_type = {
 blob_fixups: blob_fixups_user_type = {
     ('vendor/lib/libmot_chi_desktop_helper.so', 'vendor/lib64/libmot_chi_desktop_helper.so'): blob_fixup()
         .add_needed('libgui_shim_vendor.so'),
-    (
-        'vendor/lib64/camera/components/com.mot.node.c2d.so',
-        'vendor/lib64/camera/components/com.qti.node.dewarp.so',
-        'vendor/lib64/camera/components/com.vidhance.node.ica.so',
-        'vendor/lib64/camera/components/com.vidhance.node.processing.so'
-    ): blob_fixup()
-        .replace_needed('libui.so', 'libui-v34.so'),
-    'vendor/lib64/sensors.moto.so': blob_fixup()
+    ('vendor/bin/STFlashTool', 'vendor/lib64/sensors.moto.so'): blob_fixup()
         .add_needed('libbase_shim.so'),
 }  # fmt: skip
 

init/Android.bp

@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
+
 prebuilt_etc {
     name: "android.hardware.biometrics.fingerprint@2.1-service-ets2.rc",
     src: "android.hardware.biometrics.fingerprint@2.1-service-ets2.rc",
@@ -9,7 +10,6 @@ prebuilt_etc {
     vendor: true,
 }
 
-
 prebuilt_etc {
     name: "init.ets.rc",
     src: "init.ets.rc",
@@ -31,13 +31,6 @@ prebuilt_etc {
     recovery: true,
 }
 
-prebuilt_etc {
-    name: "init.vendor.st21nfc.rc",
-    src: "init.vendor.st21nfc.rc",
-    sub_dir: "init/hw",
-    vendor: true,
-}
-
 sh_binary {
     name: "init.oem.fingerprint2.sh",
     src: "init.oem.fingerprint2.sh",

init/init.vendor.st21nfc.rc

@@ -1,22 +0,0 @@
-
-# This file needs to be executed by vendor_init at boot of the device,
-# both in normal and factory mode.
-
-on early-boot
-	# Change ownership and permision of st nfc device
-	chown nfc nfc /dev/st21nfc
-	chmod 0660 /dev/st21nfc
-
-on property:ro.vendor.hw.nfc=true
-	start vendor.st_nfc_hal_service
-
-on property:ro.vendor.hw.nfc=st
-	setprop persist.vendor.nfc.config_file_name libnfc-hal-st.conf
-	start vendor.st_nfc_hal_service
-
-service vendor.st_nfc_hal_service /vendor/bin/hw/android.hardware.nfc-service.st
-	override
-	class hal
-	user nfc
-	group nfc
-	disabled

proprietary-files.txt

@@ -212,8 +212,8 @@ vendor/lib64/com.qti.feature2.stub.so
 vendor/lib64/com.qti.feature2.swmf.so
 
 # Camera - ICP
-vendor/firmware/CAMERA_ICP.elf
 vendor/firmware/CAMERA_ICP_170.elf
+vendor/firmware/CAMERA_ICP.elf
 
 # Camera - Motorola
 vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service
@@ -271,7 +271,11 @@ product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoog
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar
 
+# NFC
+vendor/bin/STFlashTool
+
 # NFC - configs
+vendor/etc/init/hw/init.vendor.st21nfc.rc
 vendor/etc/libnfc-hal-st.conf
 vendor/etc/libnfc-nci-st.conf
 vendor/etc/st21nfc_conf_ds.txt

system_ext.prop

@@ -1,8 +1,5 @@
 # Display
 sys.brightness.disable_gamma_conversion=true
 
-# NFC
-persist.nfc_cfg.config_file_name=libnfc-nci-st.conf
-
 # Telephony
 ril.subscription.types=RUIM

vendor.prop

@@ -13,7 +13,7 @@ vendor.mm.en.sec.smoothstreaming=false
 persist.vendor.camera.physical.num=4
 
 # NFC
-persist.vendor.nfc.st.multisim_fw_config=true
+ro.vendor.hw.nfc=st
 
 # Radio
 ro.telephony.default_network=27,27