aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-03-16 01:27:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-16 01:27:56 +0000
commit6b13c46e8150856331c038da9a6ef8fbf99b7742 (patch)
treed8ddd61e5c19b7c52cb38d53de604c33b8e5581f
parent2b91280dfc91a34c132ef9f4e66b5288b131cd69 (diff)
parent39473c798562a4023ade83f28b27cc2b5de020a4 (diff)
downloadandroid_log-sys-6b13c46e8150856331c038da9a6ef8fbf99b7742.tar.gz
Merge "Tweak linux_glibc properties for musl builds in external/rust/crates/android_log-sys" am: d4b779e292 am: 02431c0a1f am: fc2628dba0 am: 39473c7985
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/2019539 Change-Id: I0764aa9cdceefe620a855a846fa4c75111c3019d
-rw-r--r--Android.bp4
-rw-r--r--cargo2android_glibc.bp6
2 files changed, 9 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 812d4e2..185de12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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,
+ },
+}