diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | libc/Android.bp | 8 | ||||
| -rw-r--r-- | libdl/Android.bp | 1 | ||||
| -rw-r--r-- | linker/Android.bp | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index b44c29601..000000000 --- a/Android.bp +++ /dev/null @@ -1 +0,0 @@ -subdirs = ["*"] diff --git a/libc/Android.bp b/libc/Android.bp index 6b46ba09d..ad9ffbf30 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1623,9 +1623,15 @@ cc_library { ], name: "libstdc++", static_ndk_lib: true, - system_shared_libs: ["libc"], static_libs: ["libasync_safe"], + static: { + system_shared_libs: [], + }, + shared: { + system_shared_libs: ["libc"], + }, + //TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed arch: { arm: { diff --git a/libdl/Android.bp b/libdl/Android.bp index 13c8714e6..656d3abfd 100644 --- a/libdl/Android.bp +++ b/libdl/Android.bp @@ -22,6 +22,7 @@ cc_library_static { include_dirs: ["bionic/libc"], stl: "none", + system_shared_libs: [], sanitize: { never: true, diff --git a/linker/Android.bp b/linker/Android.bp index a9907ca44..0e3484af2 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -283,6 +283,7 @@ cc_binary { suffix: "64", }, }, + system_shared_libs: [], target: { android: { static_libs: ["libdebuggerd_handler_fallback"], |