diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-08 01:19:07 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-08 01:19:07 +0000 |
| commit | e333069c6ac46857144d5299350a980ef1f9eddb (patch) | |
| tree | c0dfbc19051f7acfc935d78d49693f0042dd0b3d | |
| parent | 8bd02683a4adda9e19782e232bc915f250ba5f2c (diff) | |
| parent | 264f63aa347a5dbb72366d1412b7b62404ce2eb0 (diff) | |
| download | byteorder-simpleperf-release.tar.gz | |
Snap for 11421525 from 264f63aa347a5dbb72366d1412b7b62404ce2eb0 to simpleperf-releasesimpleperf-release
Change-Id: I6b9932306ea55138f420db76ad4bc4a1d18db285
| -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 |