Commit e8f6f0be authored Mar 08, 2022 by Colin Cross

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

parent b57c42cb

core/jni/Android.bp

+1 −1

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

libs/androidfw/Android.bp

+1 −1

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

tools/validatekeymaps/Android.bp

+1 −1

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