am 353e7e5d: Merge "Update Android.bp for setjmp cookies"

* commit '353e7e5d11fa59750c5358ad3e239765dcbeb335':
  Update Android.bp for setjmp cookies
This commit is contained in:
Dan Willemsen 2015-09-17 22:44:57 +00:00 committed by Android Git Automerger
commit 305af04561

View File

@ -674,7 +674,7 @@ cc_library_static {
// automatically included. // automatically included.
cc_library_static { cc_library_static {
srcs: [ srcs: [
// These two depend on getentropy_linux.cpp, which isn't in libc_ndk.a. // These two depend on getentropy_linux.c, which isn't in libc_ndk.a.
"upstream-openbsd/lib/libc/crypt/arc4random.c", "upstream-openbsd/lib/libc/crypt/arc4random.c",
"upstream-openbsd/lib/libc/crypt/arc4random_uniform.c", "upstream-openbsd/lib/libc/crypt/arc4random_uniform.c",
@ -927,11 +927,12 @@ cc_library_static {
// initialized, resulting in nullptr dereferences. // initialized, resulting in nullptr dereferences.
"bionic/getauxval.cpp", "bionic/getauxval.cpp",
// These three require getauxval, which isn't available on older // These four require getauxval, which isn't available on older
// platforms. // platforms.
"bionic/getentropy_linux.c", "bionic/getentropy_linux.c",
"bionic/sysconf.cpp", "bionic/sysconf.cpp",
"bionic/vdso.cpp", "bionic/vdso.cpp",
"bionic/setjmp_cookie.cpp",
], ],
cflags: libc_common_cflags + ["-Wframe-larger-than=2048"], cflags: libc_common_cflags + ["-Wframe-larger-than=2048"],