diff options
| author | Per Larsen <perlarsen@google.com> | 2024-05-07 00:14:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-07 00:14:52 +0000 |
| commit | 14052e6e1637fd1099bdd589ccac363cdb75e000 (patch) | |
| tree | c414d08629a964e9414ece6bdfb52fa506ea6d6b | |
| parent | 6a147398a71b61e8fe372d435e1f864aa0a82dfe (diff) | |
| download | log-main.tar.gz | |
This reverts commit 6a147398a71b61e8fe372d435e1f864aa0a82dfe.
Reason for revert: not required after aosp/3076403
Change-Id: Iabef00bcf5d8b8edf01d4b4c62f3d54bceafed30
| -rw-r--r-- | patches/rules.mk.diff | 28 | ||||
| -rw-r--r-- | rules.mk | 13 |
2 files changed, 10 insertions, 31 deletions
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 @@ -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 @@ 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 - include make/library.mk |