tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move system_shared_libs into target.bionic clause" am: 2ffa0eb7d3

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1764658

Change-Id: I0b2facf4a49d0683683be9ba12f5f975fa7018b5
This commit is contained in:
Treehugger Robot 2021-07-22 18:28:58 +00:00 committed by Automerger Merge Worker
commit 9328d2f1d8
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libc/Android.bp
View file

@ -1978,8 +1978,12 @@ cc_library {
static: { static: {
system_shared_libs: [], system_shared_libs: [],
}, },
shared: { target: {
system_shared_libs: ["libc"], bionic: {
shared: {
system_shared_libs: ["libc"],
},
},
}, },
//TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed //TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed

6
libm/Android.bp
View file

@ -509,7 +509,11 @@ cc_library {
tidy_checks: ["-cert-dcl16-c"], tidy_checks: ["-cert-dcl16-c"],
include_dirs: ["bionic/libc"], include_dirs: ["bionic/libc"],
system_shared_libs: ["libc"], target: {
bionic: {
system_shared_libs: ["libc"],
},
},
sanitize: { sanitize: {
address: false, address: false,