aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Homescu <ahomescu@google.com>2024-05-08 00:44:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-08 00:44:35 +0000
commit700accfd4b9b135521cdceaf66b8b34fa3006b74 (patch)
tree71247fcc1bf753b6077c0f445198815275b5b24f
parentb4c89c788cf2ab527a9b9f969fe738506dc5b624 (diff)
downloadlazy_static-700accfd4b9b135521cdceaf66b8b34fa3006b74.tar.gz
Revert "rules.mk: Enable spin feature for no_std use case"
This reverts commit b4c89c788cf2ab527a9b9f969fe738506dc5b624. Reason for revert: Missing spin crate Change-Id: I69898b84bb03ddb34efd92fdbcae8884bb318fa9
-rw-r--r--cargo_embargo.json13
-rw-r--r--rules.mk21
2 files changed, 5 insertions, 29 deletions
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 5cbcf7d..e32afad 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -30,19 +30,6 @@
"no_std": true
}
}
- },
- {
- "generate_androidbp": false,
- "generate_rulesmk": true,
- "features": [
- "spin",
- "spin_no_std"
- ],
- "package": {
- "lazy_static": {
- "no_std": true
- }
- }
}
]
}
diff --git a/rules.mk b/rules.mk
index fca012a..d685e85 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,22 +1,11 @@
-# This file is generated by cargo_embargo.
-# Do not modify this file after the LOCAL_DIR line
-# because the changes will be overridden on upgrade.
-# Content before the first line starting with LOCAL_DIR is preserved.
+# This file is generated by cargo2rulesmk.py --run.
+# Do not modify this file as changes will be overridden on upgrade.
LOCAL_DIR := $(GET_LOCAL_DIR)
MODULE := $(LOCAL_DIR)
MODULE_CRATE_NAME := lazy_static
-MODULE_RUST_CRATE_TYPES := rlib
-MODULE_SRCS := $(LOCAL_DIR)/src/lib.rs
-MODULE_ADD_IMPLICIT_DEPS := false
-MODULE_RUST_EDITION := 2015
-MODULE_RUSTFLAGS += \
- --cfg 'feature="spin"' \
- --cfg 'feature="spin_no_std"'
-
-MODULE_LIBRARY_DEPS := \
- external/rust/crates/spin \
- trusty/user/base/lib/libcompiler_builtins-rust \
- trusty/user/base/lib/libcore-rust
+MODULE_SRCS := \
+ $(LOCAL_DIR)/src/lib.rs \
+MODULE_RUST_EDITION := 2015
include make/library.mk