Snap for 11730676 from c5ca70cba694d91af1408d9bdf25bb4d75dd44c9 to sdk-release
Change-Id: I5162b2ddce6b935ac0b38e1c30646145d795bdce
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 00d5caf..399f465 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,6 @@
{
"git": {
- "sha1": "015ae060f971a4100b8515e9e1ad1531ed568700"
- }
-}
+ "sha1": "68443958b49839d4f1305dae856582f58180df43"
+ },
+ "path_in_vcs": ""
+}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index f8d4683..b3a9c34 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
// This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
package {
default_applicable_licenses: [
@@ -44,7 +46,7 @@
host_supported: true,
crate_name: "android_log_sys",
cargo_env_compat: true,
- cargo_pkg_version: "0.2.0",
+ cargo_pkg_version: "0.3.1",
srcs: ["src/lib.rs"],
edition: "2015",
apex_available: [
diff --git a/Cargo.toml b/Cargo.toml
index 4ed8005..7a73f32 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,24 +3,29 @@
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
[package]
name = "android_log-sys"
-version = "0.2.0"
-authors = ["Nerijus Arlauskas <nercury@gmail.com>"]
-description = "FFI bindings to Android log Library.\n"
+version = "0.3.1"
+authors = ["The android_log_sys Developers"]
+description = """
+FFI bindings to Android log Library.
+"""
documentation = "https://docs.rs/android_log-sys"
readme = "README.md"
-keywords = ["ffi", "android", "log"]
+keywords = [
+ "ffi",
+ "android",
+ "log",
+]
categories = ["external-ffi-bindings"]
license = "MIT OR Apache-2.0"
-repository = "https://github.com/nercury/android_log-sys-rs"
+repository = "https://github.com/rust-mobile/android_log-sys-rs"
[lib]
name = "android_log_sys"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 58606bc..ca63cea 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,12 +1,12 @@
[package]
name = "android_log-sys"
-version = "0.2.0"
+version = "0.3.1"
authors = [
- "Nerijus Arlauskas <nercury@gmail.com>",
+ "The android_log_sys Developers",
]
license = "MIT OR Apache-2.0"
readme = "README.md"
-repository = "https://github.com/nercury/android_log-sys-rs"
+repository = "https://github.com/rust-mobile/android_log-sys-rs"
description = """
FFI bindings to Android log Library.
"""
diff --git a/METADATA b/METADATA
index e5c375b..f1bfedf 100644
--- a/METADATA
+++ b/METADATA
@@ -1,19 +1,20 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update external/rust/crates/android_log-sys
+# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
+
name: "android_log-sys"
description: "FFI bindings to Android log Library."
third_party {
- url {
- type: HOMEPAGE
- value: "https://crates.io/crates/android_log-sys"
- }
- url {
- type: ARCHIVE
- value: "https://static.crates.io/crates/android_log-sys/android_log-sys-0.2.0.crate"
- }
- version: "0.2.0"
license_type: NOTICE
last_upgrade_date {
- year: 2020
- month: 7
- day: 22
+ year: 2024
+ month: 4
+ day: 17
+ }
+ homepage: "https://crates.io/crates/android_log-sys"
+ identifier {
+ type: "Archive"
+ value: "https://static.crates.io/crates/android_log-sys/android_log-sys-0.3.1.crate"
+ version: "0.3.1"
}
}
diff --git a/patches/0001-Add-support-for-selecting-log-buffers.patch b/patches/0001-Add-support-for-selecting-log-buffers.patch
deleted file mode 100644
index f56fa6d..0000000
--- a/patches/0001-Add-support-for-selecting-log-buffers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
