diff options
| author | Khyber Sen <khyber@google.com> | 2024-02-05 20:00:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-05 20:00:22 +0000 |
| commit | 23cd1c9c0702eee6b6ac6326ce3da3f6c92e6d61 (patch) | |
| tree | 747a8c1520181dbbda47d06d39166f587f428598 | |
| parent | ca8af128d173ac2c8fefc804e8368a799b12b463 (diff) | |
| parent | 1aab01da491b8a453645fffdbbdd44f06beebb76 (diff) | |
| download | serde-23cd1c9c0702eee6b6ac6326ce3da3f6c92e6d61.tar.gz | |
Disable std in trusty kernel builds am: 1aab01da49emu-34-2-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/2938402
Change-Id: I2fa01a778a436fea4880d8d27ca251e4d836e0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/rules.mk.diff | 18 | ||||
| -rw-r--r-- | rules.mk | 6 |
2 files changed, 19 insertions, 5 deletions
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff index 34a66ce..019e2d9 100644 --- a/patches/rules.mk.diff +++ b/patches/rules.mk.diff @@ -1,13 +1,21 @@ diff --git a/rules.mk b/rules.mk -index 5e5b3d4..5aeddb1 100644 +index 442c6fc..6c64bf9 100644 --- a/rules.mk +++ b/rules.mk -@@ -15,4 +15,8 @@ MODULE_RUSTFLAGS += \ +@@ -13,9 +13,16 @@ MODULE_RUSTFLAGS += \ + --cfg 'feature="default"' \ + --cfg 'feature="derive"' \ --cfg 'feature="serde_derive"' \ ++ ++ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),true) ++ ++MODULE_RUSTFLAGS += \ --cfg 'feature="std"' \ -+MODULE_LIBRARY_DEPS := \ -+ trusty/user/base/lib/liballoc-rust \ -+ external/rust/crates/serde_derive \ ++endif + + MODULE_LIBRARY_DEPS := \ ++ trusty/user/base/lib/liballoc-rust \ + external/rust/crates/serde_derive \ + include make/library.mk @@ -13,8 +13,14 @@ MODULE_RUSTFLAGS += \ --cfg 'feature="default"' \ --cfg 'feature="derive"' \ --cfg 'feature="serde_derive"' \ + +ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),true) + +MODULE_RUSTFLAGS += \ --cfg 'feature="std"' \ +endif + MODULE_LIBRARY_DEPS := \ trusty/user/base/lib/liballoc-rust \ external/rust/crates/serde_derive \ |