aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Larsen <perlarsen@google.com>2023-11-09 00:46:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 00:46:16 +0000
commit598f6e6f443372c3c8a0a8d35cb2e88252f74468 (patch)
tree62adb9b3d673a0972fe2812086c5ff2cd4cc5f99
parent6e31631e5996ba16914467f5747f1dd8ba69c0d9 (diff)
parent000e2c6c8a5952a3bfbe5986ba4d42a5fb576bde (diff)
downloadlog-598f6e6f443372c3c8a0a8d35cb2e88252f74468.tar.gz
Adding autogenerated Trusty makefile rules am: 000e2c6c8a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/2751406 Change-Id: I4c4998e75ae8852d25eb23c903c292add61ea7c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cargo2rulesmk.json3
-rw-r--r--patches/rules.mk.diff12
-rw-r--r--rules.mk19
3 files changed, 34 insertions, 0 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json
new file mode 100644
index 0000000..01f7467
--- /dev/null
+++ b/cargo2rulesmk.json
@@ -0,0 +1,3 @@
+{
+ "patch": "patches/rules.mk.diff"
+}
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
new file mode 100644
index 0000000..cdd223e
--- /dev/null
+++ b/patches/rules.mk.diff
@@ -0,0 +1,12 @@
+diff --git b/rules.mk a/rules.mk
+index 481dd29..329d328 100644
+--- b/rules.mk
++++ a/rules.mk
+@@ -15,7 +15,5 @@ MODULE_RUSTFLAGS += \
+ MODULE_LIBRARY_DEPS := \
+ external/rust/crates/cfg-if \
+ external/rust/crates/serde \
+- external/rust/crates/sval \
+- external/rust/crates/value-bag \
+
+ include make/library.mk
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..139dca3
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,19 @@
+# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features .
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := log
+MODULE_SRCS := \
+ $(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2015
+MODULE_RUSTFLAGS += \
+ --cfg 'atomic_cas' \
+ --cfg 'has_atomics' \
+
+MODULE_LIBRARY_DEPS := \
+ external/rust/crates/cfg-if \
+ external/rust/crates/serde \
+
+include make/library.mk