diff options
| author | 2022-03-08 18:17:43 -0800 | |
|---|---|---|
| committer | 2022-03-09 16:31:28 -0800 | |
| commit | e8f6f0beccecace0daca91acae226350cbc01bec (patch) | |
| tree | aef5766128bbb5f62d9f8e973f431c16c68ecbef | |
| parent | b57c42cb439ed4ed22a66867a75b15818edd8081 (diff) | |
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
| -rw-r--r-- | core/jni/Android.bp | 2 | ||||
| -rw-r--r-- | libs/androidfw/Android.bp | 2 | ||||
| -rw-r--r-- | tools/validatekeymaps/Android.bp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 96e4d186ab7e..51939b2a139a 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -342,7 +342,7 @@ cc_library_shared { "libhostgraphics", ], }, - linux_glibc: { + host_linux: { srcs: [ "android_content_res_ApkAssets.cpp", "android_database_CursorWindow.cpp", diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 63b831de5da1..c80fb188e70f 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -118,7 +118,7 @@ cc_library { "libz", ], }, - linux_glibc: { + host_linux: { srcs: [ "CursorWindow.cpp", ], diff --git a/tools/validatekeymaps/Android.bp b/tools/validatekeymaps/Android.bp index 0423b7abd685..ff24d160b917 100644 --- a/tools/validatekeymaps/Android.bp +++ b/tools/validatekeymaps/Android.bp @@ -32,7 +32,7 @@ cc_binary_host { "libui-types", ], target: { - linux_glibc: { + host_linux: { static_libs: [ // libbinder is only available for linux "libbinder", |