diff options
| -rwxr-xr-x | build/apex/art_apex_test.py | 1 | ||||
| -rw-r--r-- | dex2oat/Android.bp | 12 | ||||
| -rw-r--r-- | tools/hiddenapi/Android.bp | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index e5b72ee4a7..05cc1a6314 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -569,7 +569,6 @@ class ReleaseTargetChecker: self._checker.check_native_library('libandroidio') # Check internal native library dependencies. - self._checker.check_native_library('libcrypto') self._checker.check_native_library('libexpat') diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp index 4002cb55ee..1bec1cf889 100644 --- a/dex2oat/Android.bp +++ b/dex2oat/Android.bp @@ -77,11 +77,13 @@ art_cc_defaults { generated_sources: ["art_dex2oat_operator_srcs"], shared_libs: [ "libbase", - "libcrypto", // For SHA-1 checksumming of build ID "liblog", "liblz4", "libz", ], + static_libs: [ + "libcrypto_for_art", // For SHA-1 checksumming of build ID + ], export_include_dirs: ["."], } @@ -89,7 +91,7 @@ cc_defaults { name: "libart-dex2oat_static_base_defaults", whole_static_libs: [ "libbase", - "libcrypto", + "libcrypto_for_art", "liblog", "liblz4", "libz", @@ -221,12 +223,14 @@ cc_defaults { shared_libs: [ "libartpalette", "libbase", - "libcrypto", "liblz4", // libart(d)-dex2oat dependency; must be repeated here since it's a static lib. "liblog", "libsigchain", "libz", ], + static_libs: [ + "libcrypto_for_art", + ], }, }, } @@ -500,7 +504,7 @@ art_cc_defaults { "liblog", ], static_libs: [ - "libcrypto_static", // Must be statically linked in standalone tests + "libcrypto_for_art", "liblz4", // libart(d)-dex2oat dependency; must be repeated here since it's a static lib. ], } diff --git a/tools/hiddenapi/Android.bp b/tools/hiddenapi/Android.bp index fff94926ab..506197ce46 100644 --- a/tools/hiddenapi/Android.bp +++ b/tools/hiddenapi/Android.bp @@ -41,7 +41,7 @@ cc_defaults { stl: "c++_static", static_libs: [ "libbase", - "libcrypto", + "libcrypto_for_art", ], } |