diff options
author | Colin Cross <ccross@android.com> | 2022-03-25 01:32:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-25 01:32:33 +0000 |
commit | 24832cd6d3fa0cfd7aab8ff6e938ce9f64cd9373 (patch) | |
tree | 038ab12226fdeffe9183d3492e7ee1a7ace21519 | |
parent | a6160c08eac1107d4e0bbeb7a77500b52fc14b36 (diff) | |
parent | 81c07084cca2a6feab53eeb022f5d5a3ab5c10c5 (diff) | |
download | libbcc-24832cd6d3fa0cfd7aab8ff6e938ce9f64cd9373.tar.gz |
Merge "Tweak linux_glibc properties for musl builds in frameworks/compile" am: cfb6d26e9a am: bceedd5d83 am: 76e9e6b04b am: 81c07084ccaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/2019317
Change-Id: I1750060dbb5a131a82136d9743c7b0264c2350a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | bcinfo/Android.bp | 2 | ||||
-rw-r--r-- | lib/Android.bp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp index 95f7f0d..13c27cd 100644 --- a/bcinfo/Android.bp +++ b/bcinfo/Android.bp @@ -82,7 +82,7 @@ cc_library_shared { darwin: { shared_libs: ["libLLVM_android"], }, - linux_glibc: { + host_linux: { allow_undefined_symbols: true, }, host: { diff --git a/lib/Android.bp b/lib/Android.bp index 583afa0..7c53f60 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -63,7 +63,7 @@ cc_library { darwin: { shared_libs: ["libLLVM_android"], }, - linux_glibc: { + host_linux: { static_libs: ["libLLVMLinker"], allow_undefined_symbols: true, }, |