diff --git a/Android.bp b/Android.bp index 3585ece..a193b66 100644 --- a/Android.bp +++ b/Android.bp @@ -321,90 +321,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libskeymint10device", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libskeymint10device.so", - ], - shared_libs: [ - "libshim_crypto", - "android.hardware.security.rkp-V3-ndk", - "libcrypto-tm", - "liblog", - "libcutils", - "libutils", - "libbase", - "libhidlbase", - "libbinder_ndk", - "libskeymint_cli", - "libsecril-client", - "vendor.samsung.hardware.keymint-V1-ndk_platform", - "android.hardware.security.keymint-V4-ndk", - "android.hardware.security.sharedsecret-V1-ndk", - "android.hardware.security.secureclock-V1-ndk", - "libcppbor_external", - "libjsoncpp", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libskeymint_cli", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libskeymint_cli.so", - ], - shared_libs: [ - "libshim_crypto", - "android.hardware.security.rkp-V3-ndk", - "liblog", - "libbase", - "libcutils", - "libutils", - "android.hardware.keymaster@4.0", - "android.hardware.keymaster@4.1", - "libkeymaster4support", - "libkeymaster4_1support", - "libhidlbase", - "libcrypto-tm", - "libbinder_ndk", - "libsecril-client", - "android.hardware.security.keymint-V4-ndk", - "android.hardware.security.sharedsecret-V1-ndk", - "android.hardware.security.secureclock-V1-ndk", - "libjsoncpp", - "libteecl", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libswlme", owner: "samsung", @@ -432,23 +348,3 @@ cc_prebuilt_library_shared { prefer: true, soc_specific: true, } - -cc_prebuilt_binary { - name: "android.hardware.security.keymint-service.samsung", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung", - ], - }, - }, - compile_multilib: "64", - check_elf_files: false, - strip: { - none: true, - }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} diff --git a/m34x-vendor.mk b/m34x-vendor.mk index b5d04da..fc477b1 100644 --- a/m34x-vendor.mk +++ b/m34x-vendor.mk @@ -233,7 +233,4 @@ PRODUCT_PACKAGES += \ libexynoscamera_vpl_plugin \ liblmecpu \ libsec2lsi_conversion \ - libskeymint10device \ - libskeymint_cli \ - libswlme \ - android.hardware.security.keymint-service.samsung + libswlme diff --git a/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung b/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung deleted file mode 100755 index 6f0663c..0000000 Binary files a/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung and /dev/null differ diff --git a/proprietary/vendor/lib64/libskeymint10device.so b/proprietary/vendor/lib64/libskeymint10device.so deleted file mode 100644 index 124c91d..0000000 Binary files a/proprietary/vendor/lib64/libskeymint10device.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libskeymint_cli.so b/proprietary/vendor/lib64/libskeymint_cli.so deleted file mode 100644 index 5c9d14d..0000000 Binary files a/proprietary/vendor/lib64/libskeymint_cli.so and /dev/null differ