diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-01-05 23:14:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-05 23:14:43 +0000 |
| commit | 507d6f2a51f907f46b5d4bfe32b5a826ad7dd25f (patch) | |
| tree | d58ffcc743723e687ac24f8c9bb4841efb9edad1 | |
| parent | e647db7485d79135adae87be02ca1e78e5f46206 (diff) | |
| parent | 9b59acc9c766c8056d65b920c8c7cf96e3dcb3e0 (diff) | |
| download | bionic-507d6f2a51f907f46b5d4bfe32b5a826ad7dd25f.tar.gz | |
Merge "libc: Update Android.bp with recent changes"
| -rw-r--r-- | libc/Android.bp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 74fd22b78..d355d4cad 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1348,6 +1348,7 @@ cc_library_static { "bionic/getpid.cpp", "bionic/gettid.cpp", "bionic/__gnu_basename.cpp", + "bionic/ifaddrs.cpp", "bionic/inotify_init.cpp", "bionic/ioctl.cpp", "bionic/lchown.cpp", @@ -1766,7 +1767,6 @@ cc_library { nocrt: true, - // special for arm arch: { arm: { //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. version_script: "libc.arm.map", + product_variables: { + brillo: { + version_script: "libc.arm.brillo.map", + }, + }, shared: { srcs: ["arch-arm/bionic/exidx_dynamic.c"], @@ -1781,6 +1786,8 @@ cc_library { static: { srcs: ["arch-arm/bionic/exidx_static.c"], }, + + // special for arm cflags: ["-DCRT_LEGACY_WORKAROUND"], srcs: [ "arch-arm/bionic/atexit_legacy.c", @@ -1793,6 +1800,11 @@ cc_library { mips: { // Don't re-export new/delete and friends, even if the compiler really wants to. version_script: "libc.mips.map", + product_variables: { + brillo: { + version_script: "libc.mips.brillo.map", + }, + }, }, mips64: { // 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. version_script: "libc.x86.map", + product_variables: { + brillo: { + version_script: "libc.x86.brillo.map", + }, + }, }, x86_64: { // Don't re-export new/delete and friends, even if the compiler really wants to. |