aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2022-02-25 19:32:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-25 19:32:42 +0000
commit3c06db88724580cf3609e9a382805e55efa500a8 (patch)
tree2987d16a0f8362f9d255e549007ad1a13e61efd1
parent1d0f664a54562dca18474e3f8889226076dc9454 (diff)
parent28f6d222e2d967079f97d69e413f58d893321e0f (diff)
downloadandroid_log-sys-3c06db88724580cf3609e9a382805e55efa500a8.tar.gz
Add support for selecting log buffers am: e19343ab52 am: cf2575b238 am: 28f6d222e2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/1999353 Change-Id: Ia2d13cf91d768d42b6edc7bdf5f73655bfc0ede4
-rw-r--r--patches/0001-Add-support-for-selecting-log-buffers.patch33
-rw-r--r--src/lib.rs5
2 files changed, 38 insertions, 0 deletions
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,