Snap for 8558685 from 39473c798562a4023ade83f28b27cc2b5de020a4 to tm-frc-networking-releaset_frc_net_330443000android13-frc-networking-release

Change-Id: I44a925000956d4bdee0803bda0fd26e5af78ecc0

5 files changed, 47 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,
+    },
+}
diff --git a/patches/0001-Add-support-for-selecting-log-buffers.patch b/patches/0001-Add-support-for-selecting-log-buffers.patch
new file mode 100644
index 0000000..f56fa6d
--- /dev/null
+++ b/patches/0001-Add-support-for-selecting-log-buffers.patch
@@ -0,0 +1,33 @@
+From fb544f370ca1ae5b5c9de3a0c336ad9986537443 Mon Sep 17 00:00:00 2001
+From: Matthew Maurer <mmaurer@google.com>
+Date: Thu, 24 Feb 2022 13:41:53 -0800
+Subject: [PATCH] Add support for selecting log buffers
+
+While `__android_log_write_log_message` can select a target log buffer,
+it did not exist before API version 30. To allow selecting a log buffer
+for earlier APIs, we add a signature for `__android_log_buf_write`.
+
+Change-Id: Ie933a9b00436a626bd200242047d646c564e9e13
+---
+ src/lib.rs | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/lib.rs b/src/lib.rs
+index eba5b19..b648ed5 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -66,6 +66,11 @@ extern "C" {
+                                tag: *const c_char,
+                                text: *const c_char)
+                                -> c_int;
++    pub fn __android_log_buf_write(bufID: c_int,
++                                   prio: c_int,
++                                   tag: *const c_char,
++                                   text: *const c_char)
++                                   -> c_int;
+     pub fn __android_log_print(prio: c_int,
+                                tag: *const c_char,
+                                fmt: *const c_char,
+-- 
+2.35.1.574.g5d30c73bfb-goog
+
diff --git a/src/lib.rs b/src/lib.rs
index eba5b19..b648ed5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,6 +66,11 @@ extern "C" {
                                tag: *const c_char,
                                text: *const c_char)
                                -> c_int;
+    pub fn __android_log_buf_write(bufID: c_int,
+                                   prio: c_int,
+                                   tag: *const c_char,
+                                   text: *const c_char)
+                                   -> c_int;
     pub fn __android_log_print(prio: c_int,
                                tag: *const c_char,
                                fmt: *const c_char,