aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Brazdil <dbrazdil@google.com>2022-07-08 16:46:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-07-08 16:46:27 +0000
commitbc514d55cce096faf102c73404c879b2a966f10e (patch)
treeaca515d0b4351bf646c3b775c2b7263bc61767b3
parentd94aa9516169ec7daa3574a3e2402d35654a7e77 (diff)
parent748a6815a8ed940cc695e997adb8a43032504470 (diff)
downloadlog-bc514d55cce096faf102c73404c879b2a966f10e.tar.gz
log: Create liblog_rust_nostd bare-metal target am: ffad887b3a am: 7d89f5f0af am: 748a6815a8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/2146039 Change-Id: I7ff8094008ce90954b53ba6f340e6e29959f79d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp22
-rw-r--r--cargo2android.json1
-rw-r--r--cargo2android_nostd.bp20
3 files changed, 43 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index e96d563..f75e6b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,3 +62,25 @@ rust_library {
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",
+}
+
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"
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",
+}