diff options
| author | borbelyvince <borbely.vince.11@gmail.com> | 2024-11-16 14:49:41 +0100 |
|---|---|---|
| committer | borbelyvince <borbely.vince.11@gmail.com> | 2024-12-10 17:25:24 +0100 |
| commit | fe93bfaf0af339851071307d276f7f85afc48c7c (patch) | |
| tree | 25fa0fd151d0ad7d29e39b039cad76a9d8245a5e | |
| parent | d1ab398d29abf01e499765f3d687ce0888627594 (diff) | |
Revert "universal9830: Rename libcrypto-v33 to libcrypto-tm"
This reverts commit cf35479ae4671802a536cccd593f38dcfa7c6657.
| -rw-r--r-- | device-common.mk | 4 | ||||
| -rwxr-xr-x | extract-files.sh | 4 | ||||
| -rw-r--r-- | vndk/Android.bp | 8 | ||||
| l--------- | vndk/libcrypto-v33.so (renamed from vndk/libcrypto-tm.so) | 0 | ||||
| l--------- | vndk/libssl-v33.so (renamed from vndk/libssl-tm.so) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/device-common.mk b/device-common.mk index 9d737fa..d9075d8 100644 --- a/device-common.mk +++ b/device-common.mk @@ -150,9 +150,9 @@ PRODUCT_PACKAGES += \ libkeymaster4_1support.vendor:64 PRODUCT_PACKAGES += \ - libcrypto-tm \ + libcrypto-v33 \ libshim_crypto:64 \ - libssl-tm + libssl-v33 # Livedisplay PRODUCT_PACKAGES += \ diff --git a/extract-files.sh b/extract-files.sh index 2828b4c..6c822d5 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -81,8 +81,8 @@ function blob_fixup() { "${PATCHELF}" --add-needed libsensorndkbridge_shim.so "${2}" ;; vendor/lib*/libskeymaster4device.so) - "${PATCHELF}" --replace-needed libcrypto.so libcrypto-tm.so "${2}" - "${PATCHELF}" --add-needed libssl-tm.so "${2}" + "${PATCHELF}" --replace-needed libcrypto.so libcrypto-v33.so "${2}" + "${PATCHELF}" --add-needed libssl-v33.so "${2}" "${PATCHELF}" --add-needed libshim_crypto.so "${2}" ;; vendor/lib*/libwvhidl.so) diff --git a/vndk/Android.bp b/vndk/Android.bp index 07099ee..7577665 100644 --- a/vndk/Android.bp +++ b/vndk/Android.bp @@ -15,10 +15,10 @@ // cc_prebuilt_library_shared { - name: "libcrypto-tm", + name: "libcrypto-v33", target: { android_arm64: { - srcs: ["libcrypto-tm.so"], + srcs: ["libcrypto-v33.so"], }, }, compile_multilib: "64", @@ -27,10 +27,10 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libssl-tm", + name: "libssl-v33", target: { android_arm64: { - srcs: ["libssl-tm.so"], + srcs: ["libssl-v33.so"], }, }, compile_multilib: "64", diff --git a/vndk/libcrypto-tm.so b/vndk/libcrypto-v33.so index 9f8a0be..9f8a0be 120000 --- a/vndk/libcrypto-tm.so +++ b/vndk/libcrypto-v33.so diff --git a/vndk/libssl-tm.so b/vndk/libssl-v33.so index 05cee97..05cee97 120000 --- a/vndk/libssl-tm.so +++ b/vndk/libssl-v33.so |