Revert "Trusty: Don't implicitly depend on rust_support" am: 14052e6e16
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/3074945
Change-Id: I014277299245523ccd464005ef440b78585f67d8
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
index 6f870bc..cdd223e 100644
--- a/patches/rules.mk.diff
+++ b/patches/rules.mk.diff
@@ -1,22 +1,12 @@
-diff --git a/rules.mk b/rules.mk
-index 425fd1c..1f25698 100644
---- a/rules.mk
-+++ b/rules.mk
-@@ -14,5 +14,17 @@ MODULE_RUSTFLAGS += \
-
+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 \
-+
-+ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),false)
-+
-+# avoid cyclic dependence by adding dependencies manually
-+MODULE_ADD_IMPLICIT_DEPS := false
-+
-+MODULE_DEPS := \
-+ trusty/user/base/lib/libcore-rust/ \
-+ trusty/user/base/lib/libcompiler_builtins-rust/ \
-+
-+endif
-
+ 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
index 1f25698..139dca3 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,4 @@
-# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json.
+# 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)
@@ -16,15 +16,4 @@
external/rust/crates/cfg-if \
external/rust/crates/serde \
-ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),false)
-
-# avoid cyclic dependence by adding dependencies manually
-MODULE_ADD_IMPLICIT_DEPS := false
-
-MODULE_DEPS := \
- trusty/user/base/lib/libcore-rust/ \
- trusty/user/base/lib/libcompiler_builtins-rust/ \
-
-endif
-
include make/library.mk
