aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2021-06-22 13:25:46 -0700
committerColin Cross <ccross@android.com>2021-06-23 16:44:57 -0700
commit10d9268676036f6a7aa78390dc70b3b0bfda3dbe (patch)
tree5cdeae097046e09b04a92a668a801898e743ea51
parent80c506f854945f86c4bff99688f26b8857b6bbb2 (diff)
downloadbionic-10d9268676036f6a7aa78390dc70b3b0bfda3dbe.tar.gz
Add default_shared_libs to crt objects
cc_object modules will now honor the default_shared_libs, override it to empty to avoid circular dependencies. Bug: 153662223 Test: m checkbuild Change-Id: I02dd9510fcc0b6bf724d9cdd7c3e80c08430a7b9
-rw-r--r--libc/Android.bp12
1 files changed, 9 insertions, 3 deletions
diff --git a/libc/Android.bp b/libc/Android.bp
index fd1ce8126..d24e38744 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2046,7 +2046,7 @@ genrule {
// ========================================================
cc_defaults {
- name: "crt_defaults",
+ name: "crt_and_memtag_defaults",
defaults: ["linux_bionic_supported"],
vendor_available: true,
product_available: true,
@@ -2073,6 +2073,12 @@ cc_defaults {
}
cc_defaults {
+ name: "crt_defaults",
+ defaults: ["crt_and_memtag_defaults"],
+ default_shared_libs: [],
+}
+
+cc_defaults {
name: "crt_so_defaults",
defaults: ["crt_defaults"],
@@ -2199,7 +2205,7 @@ cc_library_static {
},
sdk_version: "minimum",
- defaults: ["crt_defaults"],
+ defaults: ["crt_and_memtag_defaults"],
}
cc_library_static {
@@ -2211,7 +2217,7 @@ cc_library_static {
},
sdk_version: "minimum",
- defaults: ["crt_defaults"],
+ defaults: ["crt_and_memtag_defaults"],
}
// ========================================================