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

2022-03-15 03:43:11 +00:00
parent dc2f8bfaee e8f6f0becc
commit ee415b6dd4
3 changed files with 3 additions and 3 deletions
--- 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",
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -118,7 +118,7 @@ cc_library {
                "libz",
            ],
        },
-        linux_glibc: {
+        host_linux: {
            srcs: [
                "CursorWindow.cpp",
            ],
--- 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",