diff options
| author | Per Larsen <perlarsen@google.com> | 2024-05-07 00:14:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-07 00:14:15 +0000 |
| commit | 9d1f9ebe86cc030a9d2910f760954f613835d7d3 (patch) | |
| tree | 747a8c1520181dbbda47d06d39166f587f428598 | |
| parent | b359a1416e0936476a7f2069b3b62f9898017947 (diff) | |
| download | serde-main.tar.gz | |
This reverts commit b359a1416e0936476a7f2069b3b62f9898017947.
Reason for revert: not required after aosp/3076403
Change-Id: Ia24ad73ef79146fe2b754531c4388448c0db6031
| -rw-r--r-- | patches/rules.mk.diff | 17 | ||||
| -rw-r--r-- | rules.mk | 11 |
2 files changed, 5 insertions, 23 deletions
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 @@ index 442c6fc..986ff0d 100644 + +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 @@ -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 @@ ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),true) 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 := \ |