diff options
| author | Colin Cross <ccross@android.com> | 2022-03-16 00:24:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-16 00:24:47 +0000 |
| commit | fc2628dba0eb0f158d993e1612d9930dc4ef9f83 (patch) | |
| tree | d8ddd61e5c19b7c52cb38d53de604c33b8e5581f | |
| parent | 92d55a6d006844fd540b237dea4c099417029a7f (diff) | |
| parent | 02431c0a1fb87421d8520fc069d73bbdd9a4e925 (diff) | |
| download | android_log-sys-fc2628dba0eb0f158d993e1612d9930dc4ef9f83.tar.gz | |
Merge "Tweak linux_glibc properties for musl builds in external/rust/crates/android_log-sys" am: d4b779e292 am: 02431c0a1f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/2019539
Change-Id: I41875547775e566863be773251e089293e262044
| -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, + }, +} |