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

libc/Android.bp: merge libc_openbsd_ndk.

Browse source 
Test: treehugger
Change-Id: I313f8ecc28f1d0129e2b6d65ace3b6a1e05c906a
This commit is contained in:
Elliott Hughes 2024-02-08 13:15:53 -08:00
parent cebe1f1351
commit 968adf951c
1 changed files with 30 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
libc/Android.bp
View file

@ -491,18 +491,16 @@ cc_library_static {
}
// ========================================================
// libc_openbsd_ndk.a - upstream OpenBSD C library code
// that can be safely included in the libc_ndk.a (doesn't
// contain any troublesome global data or constructors).
// libc_openbsd.a - upstream OpenBSD C library code
// ========================================================
//
// These files are built with the openbsd-compat.h header file
// automatically included.
cc_library_static {
name: "libc_openbsd_ndk",
defaults: ["libc_defaults"],
srcs: [
"upstream-openbsd/lib/libc/crypt/arc4random.c",
"upstream-openbsd/lib/libc/crypt/arc4random_uniform.c",
"upstream-openbsd/lib/libc/gen/alarm.c",
"upstream-openbsd/lib/libc/gen/ctype_.c",
"upstream-openbsd/lib/libc/gen/daemon.c",
@ -599,62 +597,10 @@ cc_library_static {
// This file is originally from OpenBSD, and benefits from
// being compiled with openbsd-compat.h.
// TODO: clean this up instead.
"bionic/fts.c",
],
cflags: [
"-Wno-sign-compare",
"-Wno-unused-parameter",
"-include openbsd-compat.h",
],
local_include_dirs: [
"private",
"stdio",
"upstream-openbsd/android/include",
"upstream-openbsd/lib/libc/include",
"upstream-openbsd/lib/libc/gdtoa/",
],
}
cc_library_static {
name: "libc_openbsd_large_stack",
defaults: ["libc_defaults"],
srcs: [
"stdio/vfprintf.cpp",
"stdio/vfwprintf.cpp",
"upstream-openbsd/lib/libc/string/memmem.c",
"upstream-openbsd/lib/libc/string/strstr.c",
],
cflags: [
"-include openbsd-compat.h",
"-Wno-sign-compare",
"-Wframe-larger-than=5000",
],
local_include_dirs: [
"private",
"upstream-openbsd/android/include/",
"upstream-openbsd/lib/libc/include/",
"upstream-openbsd/lib/libc/gdtoa/",
"upstream-openbsd/lib/libc/stdio/",
],
}
// ========================================================
// libc_openbsd.a - upstream OpenBSD C library code
// ========================================================
//
// These files are built with the openbsd-compat.h header file
// automatically included.
cc_library_static {
defaults: ["libc_defaults"],
srcs: [
// These two depend on getentropy, which isn't in libc_ndk.a.
"upstream-openbsd/lib/libc/crypt/arc4random.c",
"upstream-openbsd/lib/libc/crypt/arc4random_uniform.c",
],
// Each architecture has optimized versions of some routines,
// and only includes the portable C versions of ones it's missing.
arch: {
@ -712,11 +658,37 @@ cc_library_static {
local_include_dirs: [
"private",
"upstream-openbsd/android/include",
"stdio",
"upstream-openbsd/lib/libc/include",
],
name: "libc_openbsd",
}
cc_library_static {
name: "libc_openbsd_large_stack",
defaults: ["libc_defaults"],
srcs: [
"stdio/vfprintf.cpp",
"stdio/vfwprintf.cpp",
"upstream-openbsd/lib/libc/string/memmem.c",
"upstream-openbsd/lib/libc/string/strstr.c",
],
cflags: [
"-include openbsd-compat.h",
"-Wno-sign-compare",
"-Wframe-larger-than=5000",
],
local_include_dirs: [
"private",
"upstream-openbsd/android/include/",
"upstream-openbsd/lib/libc/gdtoa/",
"upstream-openbsd/lib/libc/include/",
"upstream-openbsd/lib/libc/stdio/",
],
}
// ========================================================
// libc_gdtoa.a - upstream OpenBSD C library gdtoa code
// ========================================================
@ -1392,7 +1364,6 @@ cc_library_static {
"libc_netbsd",
"libc_openbsd",
"libc_openbsd_large_stack",
"libc_openbsd_ndk",
"libc_syscalls",
"libc_tzcode",
"libstdc++",