commit fdaf1ff9b7e709a428806e3d03c025541e1e500c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 20:36:06 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 20:36:06 2022 +0000
tree d8ddd61e5c19b7c52cb38d53de604c33b8e5581f
parent 3c06db88724580cf3609e9a382805e55efa500a8
parent 39473c798562a4023ade83f28b27cc2b5de020a4

Snap for 8414339 from 39473c798562a4023ade83f28b27cc2b5de020a4 to tm-qpr1-release

Change-Id: I311fc44b113ce180b57e08d4b04209dae3e852b8

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

TEST_MAPPING

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"
     }
   ]

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