Revert "Trusty: Avoid implicitly depending on rust_support" am: 9d1f9ebe86 am: 2ca2f0f5c4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/3075126
Change-Id: I6165653ca3096ca1788cf52b7feb12ca9c73ab89
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
index 71d3386..019e2d9 100644
--- a/patches/rules.mk.diff
+++ b/patches/rules.mk.diff
@@ -1,8 +1,8 @@
diff --git a/rules.mk b/rules.mk
-index 442c6fc..986ff0d 100644
+index 442c6fc..6c64bf9 100644
--- a/rules.mk
+++ b/rules.mk
-@@ -13,9 +13,25 @@ MODULE_RUSTFLAGS += \
+@@ -13,9 +13,16 @@ MODULE_RUSTFLAGS += \
--cfg 'feature="default"' \
--cfg 'feature="derive"' \
--cfg 'feature="serde_derive"' \
@@ -11,20 +11,11 @@
+
+MODULE_RUSTFLAGS += \
--cfg 'feature="std"' \
-
-+else
-+
-+# 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
+
MODULE_LIBRARY_DEPS := \
+ trusty/user/base/lib/liballoc-rust \
external/rust/crates/serde_derive \
-
+
include make/library.mk
diff --git a/rules.mk b/rules.mk
index 140d8bc..13e25d7 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)
@@ -19,15 +19,6 @@
MODULE_RUSTFLAGS += \
--cfg 'feature="std"' \
-else
-
-# 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
MODULE_LIBRARY_DEPS := \
