ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak linux_glibc properties for musl builds in system/core

Browse source 
For convenience, builds against musl libc currently use the
linux_glibc properties because they are almost always linux-specific
and not glibc-specific.  In preparation for removing this hack,
tweak the linux_glibc properties by either moving them to host_linux,
which will apply to linux_glibc, linux_musl and linux_bionic, or
by setting appropriate musl or linux_musl properties.  Properties
that must not be repeated while musl uses linux_musl and also still
uses the linux_glibc properties are moved to glibc properties, which
don't apply to musl.  Whether these stay as glibc properties or get
moved back to linux_glibc later once the musl hack is removed is TBD.

Bug: 223257095
Test: m checkbuild
Test: m USE_HOST_MUSL=true host-native
Change-Id: I076fa026d7dddfccfa5cc395dd06bdc979eee1d8
This commit is contained in:
Colin Cross 2022-03-24 15:59:08 -07:00
parent 3d0143dc62
commit 10bbb01823
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libdiskconfig/Android.bp
View file

@ -27,12 +27,8 @@ cc_library {
darwin: {
enabled: false,
},
linux_glibc: {
host_linux: {
cflags: [
"-O2",
"-g",
"-W",
"-Wall",
"-D_LARGEFILE64_SOURCE",
],
},

4
libutils/Android.bp
View file

@ -48,13 +48,11 @@ cc_library_headers {
header_libs: ["libbacktrace_headers"],
export_header_lib_headers: ["libbacktrace_headers"],
},
linux_glibc: {
host_linux: {
header_libs: ["libbacktrace_headers"],
export_header_lib_headers: ["libbacktrace_headers"],
},
linux_bionic: {
header_libs: ["libbacktrace_headers"],
export_header_lib_headers: ["libbacktrace_headers"],
enabled: true,
},
windows: {