diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-09-02 01:51:39 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-09-02 01:51:39 +0000 |
commit | 561e19f486a43ab2030e88cfbe832095ed5c5005 (patch) | |
tree | 9f76996a63b256326f0b3c05e25e7ced68c8fa0e | |
parent | 79aa73858cf4199d48f722b3315c61654653b73b (diff) | |
parent | 6bcda392a4af664cfae81f5d1e6f40aa27310ecd (diff) | |
download | openssl-build-tools.tar.gz |
Merge "Fix default name conflict" into build-toolsbuild-tools
-rw-r--r-- | Android.bp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 49a347f1a8..c1bca0965b 100644 --- a/Android.bp +++ b/Android.bp @@ -10,7 +10,7 @@ build = [ ] cc_defaults { - name: "libopenssl_defaults", + name: "external_openssl_defaults", host_supported: true, device_supported: false, @@ -56,7 +56,7 @@ cc_defaults { cc_library { name: "libopenssl_ssl", defaults: [ - "libopenssl_defaults", + "external_openssl_defaults", "openssl_ssl_linux_arm64_defaults", "openssl_ssl_linux_x86_64_defaults", "openssl_ssl_darwin_arm64_defaults", @@ -68,7 +68,7 @@ cc_library { cc_library { name: "libopenssl_crypto", defaults: [ - "libopenssl_defaults", + "external_openssl_defaults", "openssl_crypto_linux_arm64_defaults", "openssl_crypto_linux_x86_64_defaults", "openssl_crypto_darwin_arm64_defaults", @@ -79,7 +79,7 @@ cc_library { cc_library_host_static { name: "libopenssl_apps", defaults: [ - "libopenssl_defaults", + "external_openssl_defaults", "openssl_apps_linux_arm64_defaults", "openssl_apps_linux_x86_64_defaults", "openssl_apps_darwin_arm64_defaults", @@ -90,7 +90,7 @@ cc_library_host_static { cc_binary_host { name: "openssl", defaults: [ - "libopenssl_defaults", + "external_openssl_defaults", "openssl_app_linux_arm64_defaults", "openssl_app_linux_x86_64_defaults", "openssl_app_darwin_arm64_defaults", |