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

Commit 54303475 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

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: Ieb4af745d7b219c8d74017dcb95edb1a07297cdb
parents 32bc7cbd 24e387ae

core/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ cc_library_shared { 
                "libwuffs_mirror_release_c",

            ],

        },

        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
@@ -119,7 +119,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",