Tweak linux_glibc properties for musl builds in frameworks/base

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: I7058c8f1dadd7bbfd7e169bdf0a0441eb6d10ec5
This commit is contained in:
Colin Cross 2022-03-08 18:17:43 -08:00
parent b57c42cb43
commit e8f6f0becc
3 changed files with 3 additions and 3 deletions

View File

@ -342,7 +342,7 @@ cc_library_shared {
"libhostgraphics",
],
},
linux_glibc: {
host_linux: {
srcs: [
"android_content_res_ApkAssets.cpp",
"android_database_CursorWindow.cpp",

View File

@ -118,7 +118,7 @@ cc_library {
"libz",
],
},
linux_glibc: {
host_linux: {
srcs: [
"CursorWindow.cpp",
],

View File

@ -32,7 +32,7 @@ cc_binary_host {
"libui-types",
],
target: {
linux_glibc: {
host_linux: {
static_libs: [
// libbinder is only available for linux
"libbinder",