diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-06 20:52:02 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-06 20:52:02 +0000 |
| commit | c0d70c8f65a865ec4374afa7afc77281e53f6cf3 (patch) | |
| tree | 747a8c1520181dbbda47d06d39166f587f428598 | |
| parent | 620afa0fc4bdf970e1c02ecb35ee173bf50b5551 (diff) | |
| parent | 1aab01da491b8a453645fffdbbdd44f06beebb76 (diff) | |
| download | serde-c0d70c8f65a865ec4374afa7afc77281e53f6cf3.tar.gz | |
Snap for 11413053 from 1aab01da491b8a453645fffdbbdd44f06beebb76 to build-tools-release
Change-Id: I4ed1889a98b1d0bf0dc7ff9738ba1ce5aa7788af
| -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 \ |