diff options
| author | mosimchah <mosimchah@gmail.com> | 2021-01-13 23:53:06 -0500 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2021-01-13 23:56:56 -0500 |
| commit | e0f6a08602d60292fe75e7fead2c2bc247a3a7df (patch) | |
| tree | b3a7d103ae0eb0b76a7879b240958d0278d61e89 | |
| parent | 6d5879c4cd034453513667b88a5f705033bd8be6 (diff) | |
zl1: gx_fpd: remove libunwind and libbacktrace deps
Change-Id: Ibaa7373b2ca9d049fee21b41b973fb6b24e9e85d
| -rw-r--r-- | device.mk | 4 | ||||
| -rwxr-xr-x | extract-files.sh | 4 | ||||
| -rw-r--r-- | libshims/Android.mk | 16 | ||||
| -rw-r--r-- | proprietary-files.txt | 2 |
4 files changed, 4 insertions, 22 deletions
@@ -44,9 +44,7 @@ PRODUCT_COPY_FILES += \ # Fingerprint PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.0-service.leeco_zl1 \ - libbacktrace-vendor \ - libstdc++.vendor \ - libunwind-vendor + libstdc++.vendor # Init PRODUCT_COPY_FILES += \ diff --git a/extract-files.sh b/extract-files.sh index 445591b..637437a 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -18,8 +18,8 @@ function blob_fixup() { # Patch blobs for VNDK vendor/bin/gx_fpd) - patchelf --replace-needed "libunwind.so" "libunwind-vendor.so" "${2}" - patchelf --replace-needed "libbacktrace.so" "libbacktrace-vendor.so" "${2}" + patchelf --remove-needed "libunwind.so" "${2}" + patchelf --remove-needed "libbacktrace.so" "${2}" ;; # Patch blobs for VNDK diff --git a/libshims/Android.mk b/libshims/Android.mk index 7e63601..489d344 100644 --- a/libshims/Android.mk +++ b/libshims/Android.mk @@ -15,28 +15,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_STATIC_LIBRARES := libbacktrace -LOCAL_MODULE := libbacktrace-vendor -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) LOCAL_MODULE := libshims_gxfpd LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := gxfpd_shim.cpp LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) -include $(CLEAR_VARS) -LOCAL_STATIC_LIBRARES := libunwind -LOCAL_MODULE := libunwind-vendor -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - # fake print lib for hexedited fingerprint libs include $(CLEAR_VARS) diff --git a/proprietary-files.txt b/proprietary-files.txt index fbaa3c5..769efee 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -223,7 +223,7 @@ etc/firmware/cppf.mdt:vendor/firmware/cppf.mdt vendor/lib/libcppf.so # Fingerprint sensor - from zl1 - 6.0.1/WAXCNFN6003009091S/113 - pinned files hex edited for Q libbinder and vndk -bin/gx_fpd:vendor/bin/gx_fpd|a2aba383a989888e9a1df6437e6605643061aa68 +bin/gx_fpd:vendor/bin/gx_fpd|5a8485cf40224e8f32a7ab02cad6c7b6a6607b74 lib64/hw/fingerprint.msm8996.so:vendor/lib64/hw/fingerprint.msm8996.so|057588ee507ffa131aa7a29bb0f6ced40e2bfeec lib64/hw/gxfingerprint5118m.default.so:vendor/lib64/hw/gxfingerprint5118m.default.so lib64/libfp_client5118m.so:vendor/lib64/libfp_client5118m.so|b115345ac2b5702c2fae3f6255e42c90b2959f20 |