Trusty: Don't implicitly depend on rust_support am: 6a147398a7 am: d69ef8f47b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/3028934
Change-Id: Icafc2191539dd0b59a3d69e3d34ea4f1575c49f4
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
index cdd223e..6f870bc 100644
--- a/patches/rules.mk.diff
+++ b/patches/rules.mk.diff
@@ -1,12 +1,22 @@
-diff --git b/rules.mk a/rules.mk
-index 481dd29..329d328 100644
---- b/rules.mk
-+++ a/rules.mk
-@@ -15,7 +15,5 @@ MODULE_RUSTFLAGS += \
+diff --git a/rules.mk b/rules.mk
+index 425fd1c..1f25698 100644
+--- a/rules.mk
++++ b/rules.mk
+@@ -14,5 +14,17 @@ MODULE_RUSTFLAGS += \
+
MODULE_LIBRARY_DEPS := \
external/rust/crates/cfg-if \
- external/rust/crates/serde \
-- external/rust/crates/sval \
-- external/rust/crates/value-bag \
-
++ 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
diff --git a/rules.mk b/rules.mk
index 139dca3..1f25698 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,4 @@
-# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features .
+# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json.
# Do not modify this file as changes will be overridden on upgrade.
LOCAL_DIR := $(GET_LOCAL_DIR)
@@ -16,4 +16,15 @@
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
