Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 074f9f5b authored Mar 15, 2022 by Colin Cross Committed by Automerger Merge Worker Mar 15, 2022

Merge "Tweak linux_glibc properties for musl builds in frameworks/base" am:...

Merge "Tweak linux_glibc properties for musl builds in frameworks/base" am: ee415b6d am: 0465454a am: 8927c1f9 am: 24e387ae

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019598

Change-Id: I3126cae230bd14b053089d5d82f7c1a5749ec35e

parents 39126f00 24e387ae

core/jni/Android.bp

+1 −1

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

libs/androidfw/Android.bp

+1 −1

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

tools/validatekeymaps/Android.bp

+1 −1

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