generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "libc: Update Android.bp with recent changes"

Browse Source
This commit is contained in:
Dan Willemsen 2016-01-05 23:14:43 +00:00 committed by Gerrit Code Review
commit 507d6f2a51
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libc/Android.bp
View File

@ -1348,6 +1348,7 @@ cc_library_static {
"bionic/getpid.cpp", "bionic/getpid.cpp",
"bionic/gettid.cpp", "bionic/gettid.cpp",
"bionic/__gnu_basename.cpp", "bionic/__gnu_basename.cpp",
"bionic/ifaddrs.cpp",
"bionic/inotify_init.cpp", "bionic/inotify_init.cpp",
"bionic/ioctl.cpp", "bionic/ioctl.cpp",
"bionic/lchown.cpp", "bionic/lchown.cpp",
@ -1766,7 +1767,6 @@ cc_library {
nocrt: true, nocrt: true,
// special for arm
arch: { arch: {
arm: { arm: {
//TODO: This is to work around b/24465209. Remove after root cause is fixed //TODO: This is to work around b/24465209. Remove after root cause is fixed
@ -1774,6 +1774,11 @@ cc_library {
// Don't re-export new/delete and friends, even if the compiler really wants to. // Don't re-export new/delete and friends, even if the compiler really wants to.
version_script: "libc.arm.map", version_script: "libc.arm.map",
product_variables: {
brillo: {
version_script: "libc.arm.brillo.map",
},
},
shared: { shared: {
srcs: ["arch-arm/bionic/exidx_dynamic.c"], srcs: ["arch-arm/bionic/exidx_dynamic.c"],
@ -1781,6 +1786,8 @@ cc_library {
static: { static: {
srcs: ["arch-arm/bionic/exidx_static.c"], srcs: ["arch-arm/bionic/exidx_static.c"],
}, },
// special for arm
cflags: ["-DCRT_LEGACY_WORKAROUND"], cflags: ["-DCRT_LEGACY_WORKAROUND"],
srcs: [ srcs: [
"arch-arm/bionic/atexit_legacy.c", "arch-arm/bionic/atexit_legacy.c",
@ -1793,6 +1800,11 @@ cc_library {
mips: { mips: {
// Don't re-export new/delete and friends, even if the compiler really wants to. // Don't re-export new/delete and friends, even if the compiler really wants to.
version_script: "libc.mips.map", version_script: "libc.mips.map",
product_variables: {
brillo: {
version_script: "libc.mips.brillo.map",
},
},
}, },
mips64: { mips64: {
// Don't re-export new/delete and friends, even if the compiler really wants to. // Don't re-export new/delete and friends, even if the compiler really wants to.
@ -1804,6 +1816,11 @@ cc_library {
// Don't re-export new/delete and friends, even if the compiler really wants to. // Don't re-export new/delete and friends, even if the compiler really wants to.
version_script: "libc.x86.map", version_script: "libc.x86.map",
product_variables: {
brillo: {
version_script: "libc.x86.brillo.map",
},
},
}, },
x86_64: { x86_64: {
// Don't re-export new/delete and friends, even if the compiler really wants to. // Don't re-export new/delete and friends, even if the compiler really wants to.