aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-03-15 23:19:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-03-15 23:19:40 +0000
commitd4b779e29246f050cc1a79c61870e6f8da0e2967 (patch)
treed8ddd61e5c19b7c52cb38d53de604c33b8e5581f
parent4a5cb040d4881b5d6d222ee015670d596925b2df (diff)
parentf385b9af8f4c3358e5e15d6dbfdd1889c0360257 (diff)
downloadandroid_log-sys-d4b779e29246f050cc1a79c61870e6f8da0e2967.tar.gz
Merge "Tweak linux_glibc properties for musl builds in external/rust/crates/android_log-sys"
-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,
+ },
+}