From bbfff0bee3dbfeab8b28d0c65b4a2a7418a81bd2 Mon Sep 17 00:00:00 2001 From: Atakan Date: Thu, 11 Dec 2025 06:22:34 +0300 Subject: [PATCH] Revert "r8q: Shim nfc_nci_nxpsn.so and ese_spi_nxp.so with libbase_shim" This reverts commit c88cb8d1931f959cb1ffdbba03e97a787ead5f98. Change-Id: I819bb2d49a879ba0a6bf52ab54d80940de7dc529 --- Android.bp | 2 -- proprietary/vendor/lib64/ese_spi_nxp.so | Bin 149289 -> 105160 bytes proprietary/vendor/lib64/nfc_nci_nxpsn.so | Bin 428097 -> 343200 bytes 3 files changed, 2 deletions(-) diff --git a/Android.bp b/Android.bp index 12330c0..55ffdc9 100644 --- a/Android.bp +++ b/Android.bp @@ -2117,7 +2117,6 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/ese_spi_nxp.so", ], shared_libs: [ - "libbase_shim", "android.hardware.secure_element@1.0", "libcutils", "libhardware", @@ -3536,7 +3535,6 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/nfc_nci_nxpsn.so", ], shared_libs: [ - "libbase_shim", "android.hardware.nfc@1.0", "android.hardware.nfc@1.1", "android.hardware.nfc@1.2", diff --git a/proprietary/vendor/lib64/ese_spi_nxp.so b/proprietary/vendor/lib64/ese_spi_nxp.so index 52bb7dfabce13c978c2ec8150d6ba04f7c3f1834..0893ba2736c1a45ddea5af04d2ccb6c617cfb651 100644 GIT binary patch delta 2885 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�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 delta 41685 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 r)tKbo`DU2-qbg)w~g&jA>*sOtEz!`=BGBZPE2