diff options
| author | Khyber Sen <khyber@google.com> | 2024-02-05 20:18:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-05 20:18:19 +0000 |
| commit | 5f10182bf708315cb23cf1ee6e88dcd4036eb66d (patch) | |
| tree | c0dfbc19051f7acfc935d78d49693f0042dd0b3d | |
| parent | dcec60c034b366f620b7c352276c670049294908 (diff) | |
| parent | 264f63aa347a5dbb72366d1412b7b62404ce2eb0 (diff) | |
| download | byteorder-emu-34-2-dev.tar.gz | |
Disable std in trusty kernel builds am: 264f63aa34HEADmastermainemu-34-2-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/byteorder/+/2938260
Change-Id: Ib73a220f0690b9baec4447cda1b22de81c6c2c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2rulesmk.json | 3 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 17 | ||||
| -rw-r--r-- | rules.mk | 8 |
3 files changed, 27 insertions, 1 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..3f48c7d --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,3 @@ +{ + "patch": "patches/rules.mk.diff" +}
\ No newline at end of file diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..307b117 --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,17 @@ +diff --git a/rules.mk b/rules.mk +index 28e6a41..893dbc6 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -10,6 +10,12 @@ MODULE_SRCS := \ + MODULE_RUST_EDITION := 2018 + MODULE_RUSTFLAGS += \ + --cfg 'feature="default"' \ ++ ++ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),true) ++ ++MODULE_RUSTFLAGS += \ + --cfg 'feature="std"' \ + ++endif ++ + include make/library.mk @@ -1,4 +1,4 @@ -# This file is generated by cargo2rulesmk.py --run. +# 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) @@ -10,6 +10,12 @@ MODULE_SRCS := \ MODULE_RUST_EDITION := 2018 MODULE_RUSTFLAGS += \ --cfg 'feature="default"' \ + +ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),true) + +MODULE_RUSTFLAGS += \ --cfg 'feature="std"' \ +endif + include make/library.mk |