aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-20 09:03:37 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-20 09:03:37 +0000
commit4ea0487edd19f2cf012a051c1a0b14becfd11d31 (patch)
treed8ddd61e5c19b7c52cb38d53de604c33b8e5581f
parentbe240eb2229d0218365875f9b8080f65bc620a47 (diff)
parentd4b779e29246f050cc1a79c61870e6f8da0e2967 (diff)
downloadandroid_log-sys-main-cg-testing-release.tar.gz
Snap for 8327259 from d4b779e29246f050cc1a79c61870e6f8da0e2967 to main-cg-testing-releasemain-cg-testing-release
Change-Id: I366a5989d954808191e34c52c74b5422abde4f18
-rw-r--r--Android.bp4
-rw-r--r--TEST_MAPPING6
-rw-r--r--cargo2android_glibc.bp6
3 files changed, 9 insertions, 7 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/TEST_MAPPING b/TEST_MAPPING
index 37d7815..619d83c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -40,9 +40,6 @@
"name": "logger_test_multiple_init"
},
{
- "name": "open_then_run_module"
- },
- {
"name": "virtualizationservice_device_test"
}
],
@@ -81,9 +78,6 @@
"name": "logger_test_multiple_init"
},
{
- "name": "open_then_run_module"
- },
- {
"name": "virtualizationservice_device_test"
}
]
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,
+ },
+}