diff options
| author | Colin Cross <ccross@android.com> | 2022-03-16 01:29:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-16 01:29:31 +0000 |
| commit | 7ac143a3496001b764a3e0e04f2eb1e15af18538 (patch) | |
| tree | d8ddd61e5c19b7c52cb38d53de604c33b8e5581f | |
| parent | 957a636086cb163d18d3c7b32caa10fa28c7fdd8 (diff) | |
| parent | 39473c798562a4023ade83f28b27cc2b5de020a4 (diff) | |
| download | android_log-sys-android13-mainline-tzdata4-release.tar.gz | |
Merge "Tweak linux_glibc properties for musl builds in external/rust/crates/android_log-sys" am: d4b779e292 am: 02431c0a1f am: fc2628dba0 am: 39473c7985aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/2019539
Change-Id: I4d07753b6fa8efbcf71e8b29f00a9980b5ef45d0
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android_glibc.bp | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -62,5 +62,9 @@ rust_library { // liblog is not added as a dependency for linux_glibc target enabled: false, }, + linux_musl: { + // liblog is not added as a dependency for linux_musl target + enabled: false, + }, }, } diff --git a/cargo2android_glibc.bp b/cargo2android_glibc.bp index f4d25cf..7d62503 100644 --- a/cargo2android_glibc.bp +++ b/cargo2android_glibc.bp @@ -3,4 +3,8 @@ target: { // liblog is not added as a dependency for linux_glibc target enabled: false, }, -}
\ No newline at end of file + linux_musl: { + // liblog is not added as a dependency for linux_musl target + enabled: false, + }, +} |