commit 39473c798562a4023ade83f28b27cc2b5de020a4
author Colin Cross <ccross@android.com> Wed Mar 16 00:50:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 16 00:50:02 2022 +0000
tree d8ddd61e5c19b7c52cb38d53de604c33b8e5581f
parent c2fdbcb7e964e09ce7f5c558697e2946d36f5829
parent fc2628dba0eb0f158d993e1612d9930dc4ef9f83

Merge "Tweak linux_glibc properties for musl builds in external/rust/crates/android_log-sys" am: d4b779e292 am: 02431c0a1f am: fc2628dba0

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/2019539

Change-Id: Ie0d8aecc2c333d605cbb6d0d55b3874eb47d1c6d

Android.bp

diff --git a/Android.bp b/Android.bp
index 812d4e2..185de12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,5 +62,9 @@
             // 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,
+        },
     },
 }

cargo2android_glibc.bp

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 @@
         // 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,
+    },
+}