diff options
| author | 2022-03-15 05:02:57 +0000 | |
|---|---|---|
| committer | 2022-03-15 05:02:57 +0000 | |
| commit | 24e387ae49038f49680f1217aa9a32e9be83d135 (patch) | |
| tree | cad8f8de21ce8759cb1850571a0cc2a3cc249815 | |
| parent | f456b449c417d2d1b135bc1c1479ce90b03dac2d (diff) | |
| parent | 8927c1f94ebea2a603487bbac71dcfeb6db32e35 (diff) | |
Merge "Tweak linux_glibc properties for musl builds in frameworks/base" am: ee415b6dd4 am: 0465454af5 am: 8927c1f94e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019598
Change-Id: I33e43c2b80acf35e7f9790d82c98d38bf2134697
| -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 4aa00f6117b9..3a76745cc4d9 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -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", 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", |