commit 561e19f486a43ab2030e88cfbe832095ed5c5005
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Sep 02 01:51:39 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 02 01:51:39 2023 +0000
tree 9f76996a63b256326f0b3c05e25e7ced68c8fa0e
parent 79aa73858cf4199d48f722b3315c61654653b73b
parent 6bcda392a4af664cfae81f5d1e6f40aa27310ecd

Merge "Fix default name conflict" into build-tools

Android.bp

diff --git a/Android.bp b/Android.bp
index 49a347f..c1bca09 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10,7 +10,7 @@
 ]
 
 cc_defaults {
-    name: "libopenssl_defaults",
+    name: "external_openssl_defaults",
 
     host_supported: true,
     device_supported: false,
@@ -56,7 +56,7 @@
 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 {
     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_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_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",