diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 15:58:37 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 15:58:37 +0000 |
commit | 61bf982e4590a1d6d2860ceb489aee9ac7b36a9c (patch) | |
tree | d8ddd61e5c19b7c52cb38d53de604c33b8e5581f | |
parent | 469fa9d5a27c8a88e3c7cbd7671dd79d44900637 (diff) | |
parent | 39473c798562a4023ade83f28b27cc2b5de020a4 (diff) | |
download | android_log-sys-android13-frc-media-release.tar.gz |
Snap for 8512216 from 39473c798562a4023ade83f28b27cc2b5de020a4 to tm-frc-media-releaset_frc_med_330443030android13-frc-media-release
Change-Id: I588c85408634cb02c918c27b5d3037b6b0059e09
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | TEST_MAPPING | 6 | ||||
-rw-r--r-- | cargo2android_glibc.bp | 6 | ||||
-rw-r--r-- | patches/0001-Add-support-for-selecting-log-buffers.patch | 33 | ||||
-rw-r--r-- | src/lib.rs | 5 |
5 files changed, 47 insertions, 7 deletions
@@ -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 + @@ -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, |