Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 51a81b18 authored by Ahmed Harhash's avatar Ahmed Harhash
Browse files

Reapply "universal8895-common: build nfc hal from source" 

This reverts commit 45febc43.
parent 5f606353

device-common.mk

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ PRODUCT_PACKAGES += \ 
    NfcNci \

    Tag \

    com.android.nfc_extras \

    libclang_rt.ubsan_standalone-aarch64-android

    android.hardware.nfc@1.2-service.samsung



# Power

PRODUCT_PACKAGES += \

extract-files.sh

+0 −10
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTIO 
# Fix proprietary blobs

BLOB_ROOT="$ANDROID_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary



sed -i "s/xliff=\"urn:oasis:names:tc:xliff:document:1.2\"/android=\"http:\/\/schemas.android.com\/apk\/res\/android\"/" $BLOB_ROOT/etc/nfcee_access.xml

sed -i -z "s/    seclabel u:r:gpsd:s0\n//" $BLOB_ROOT/vendor/etc/init/init.gps.rc

sed -i -z "s/-g@android:wpa_wlan0\n    class main\n/-g@android:wpa_wlan0\n    interface android.hardware.wifi.supplicant@1.0::ISupplicant default\n    interface android.hardware.wifi.supplicant@1.1::ISupplicant default\n    interface android.hardware.wifi.supplicant@1.2::ISupplicant default\n    interface android.hardware.wifi.supplicant@1.3::ISupplicant default\n    class main\n/" $BLOB_ROOT/vendor/etc/init/wifi.rc

sed -i -z "s/    setprop wifi.interface wlan0\n\n/    setprop wifi.interface wlan0\n    setprop wifi.concurrent.interface swlan0\n\n/" $BLOB_ROOT/vendor/etc/init/wifi.rc
@@ -93,17 +92,13 @@ sed -i 's/str_parms_get_str/str_parms_get_mod/g' $BLOB_ROOT/lib/hw/audio.primary 
"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/android.hardware.bluetooth@1.0.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/android.hardware.gnss@1.0.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/android.hardware.gnss@1.1.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/android.hardware.nfc@1.0.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/android.hardware.nfc@1.1.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/libGrallocWrapper.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/libskeymaster.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/vendor.samsung.hardware.bluetooth@1.0.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/vendor.samsung.hardware.gnss@1.0.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/vendor.samsung.hardware.nfc@1.1.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/lib64/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/bin/hw/android.hardware.bluetooth@1.0-service

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/bin/hw/android.hardware.drm@1.1-service.widevine

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/bin/hw/sec.android.hardware.nfc@1.1-service

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/bin/hw/vendor.samsung.hardware.gnss@1.0-service

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/bin/hw/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0-service

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib/libskeymaster3device.so
@@ -115,7 +110,6 @@ sed -i 's/str_parms_get_str/str_parms_get_mod/g' $BLOB_ROOT/lib/hw/audio.primary 
"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/hw/android.hardware.gnss@1.1-impl.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/libskeymaster3device.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/nfc_nci_sec.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/sensors.sensorhub.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/libsec-ril-dsds.so

"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/libsec-ril.so
@@ -131,14 +125,10 @@ sed -i 's/str_parms_get_str/str_parms_get_mod/g' $BLOB_ROOT/lib/hw/audio.primary 
"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/android.hardware.bluetooth@1.0.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/android.hardware.gnss@1.0.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/android.hardware.gnss@1.1.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/android.hardware.nfc@1.0.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/android.hardware.nfc@1.1.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/vendor.samsung.hardware.bluetooth@1.0.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/vendor.samsung.hardware.gnss@1.0.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/vendor.samsung.hardware.nfc@1.1.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib64/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/bin/hw/android.hardware.drm@1.1-service.widevine

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/bin/hw/sec.android.hardware.nfc@1.1-service

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib/libwvhidl.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so

"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/libsec-ril-dsds.so

manifest.xml

+0 −18
Original line number Diff line number Diff line
@@ -135,15 +135,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>android.hardware.nfc</name>

        <transport>hwbinder</transport>

        <version>1.1</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>android.hardware.radio</name>

        <transport>hwbinder</transport>
@@ -215,15 +206,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>vendor.samsung.hardware.nfc</name>

        <transport>hwbinder</transport>

        <version>1.1</version>

        <interface>

            <name>ISecNfc</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>vendor.samsung.hardware.radio</name>

        <transport>hwbinder</transport>

proprietary-files.txt

+0 −8
Original line number Diff line number Diff line
@@ -223,18 +223,10 @@ vendor/lib64/libMcClient.so 


# NFC

etc/libnfc-nci.conf

etc/nfc_key

etc/nfcee_access.xml

lib64/android.hardware.nfc@1.0.so

lib64/android.hardware.nfc@1.1.so

lib64/vendor.samsung.hardware.nfc@1.1.so

vendor/bin/hw/sec.android.hardware.nfc@1.1-service

vendor/etc/init/sec.android.hardware.nfc@1.1-service.rc

vendor/etc/libnfc-sec-vendor.conf

vendor/etc/nfc/SGP/sec_s3nrn82_rfreg.bin

vendor/etc/nfc/sec_s3nrn82_rfreg.bin

vendor/firmware/nfc/sec_s3nrn82_firmware.bin

vendor/lib64/nfc_nci_sec.so



# OMX

lib/libExynosOMX_Core.so

ramdisk/etc/init.samsung.rc

+1 −5
Original line number Diff line number Diff line
@@ -221,12 +221,8 @@ on post-fs-data 
    mkdir /efs/sec_efs/nfc 0700 nfc nfc

    mkdir /efs/nfc 0700 nfc nfc



    # NFC KEY

    # NFC: create data/vendor/nfc for nv storage

    mkdir /data/vendor/nfc 0770 nfc nfc

    mkdir /data/nfc_log 0750 nfc system

    copy /system/etc/nfc_key /data/nfc/Key

    chmod 660 /data/nfc/Key

    chown nfc nfc /data/nfc/Key



# [ SEC_SELINUX_PORTING_COMMON

    restorecon_recursive /efs