commit 71a4ea5e627c4937c42768e0474db4f8eb12b54b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 16 06:28:32 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 16 06:28:32 2022 +0000
tree aca515d0b4351bf646c3b775c2b7263bc61767b3
parent 446d91801ed743841e34a5ce2d45c5d5812ea4ac
parent 7d89f5f0af470283f86172e23b68154dd9c4e26f

Snap for 8952093 from 7d89f5f0af470283f86172e23b68154dd9c4e26f to sdk-release

Change-Id: Iab88ccbc6c1a1ad6690fc5c803c1fc0b9c28e413

Android.bp

diff --git a/Android.bp b/Android.bp
index e96d563..f75e6b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,3 +62,25 @@
     vendor_available: true,
     min_sdk_version: "29",
 }
+
+rust_library {
+    name: "liblog_rust_nostd",
+    crate_name: "log",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.4.14",
+    srcs: ["src/lib.rs"],
+    edition: "2015",
+    cfgs: [
+        "atomic_cas",
+        "has_atomics",
+    ],
+    rustlibs: [
+        "libcfg_if",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    min_sdk_version: "29",
+}
+

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 11f62b6..792a0d1 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,5 @@
 {
+  "add-toplevel-block": "cargo2android_nostd.bp",
   "apex-available": [
     "//apex_available:platform",
     "//apex_available:anyapex"

cargo2android_nostd.bp

diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..5fc0d14
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,20 @@
+rust_library {
+    name: "liblog_rust_nostd",
+    crate_name: "log",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.4.14",
+    srcs: ["src/lib.rs"],
+    edition: "2015",
+    cfgs: [
+        "atomic_cas",
+        "has_atomics",
+    ],
+    rustlibs: [
+        "libcfg_if",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    min_sdk_version: "29",
+}