diff options
| author | Colin Cross <ccross@android.com> | 2022-03-16 00:50:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-16 00:50:02 +0000 |
| commit | 39473c798562a4023ade83f28b27cc2b5de020a4 (patch) | |
| tree | d8ddd61e5c19b7c52cb38d53de604c33b8e5581f | |
| parent | c2fdbcb7e964e09ce7f5c558697e2946d36f5829 (diff) | |
| parent | fc2628dba0eb0f158d993e1612d9930dc4ef9f83 (diff) | |
| download | android_log-sys-android13-qpr3-s14-release.tar.gz | |
Merge "Tweak linux_glibc properties for musl builds in external/rust/crates/android_log-sys" am: d4b779e292 am: 02431c0a1f am: fc2628dba0t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/2019539
Change-Id: Ie0d8aecc2c333d605cbb6d0d55b3874eb47d1c6d
| -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, + }, +} |