diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 00:35:41 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 00:35:41 +0000 |
| commit | 9cca4059416448afac5fd01cc2dafcf30721be87 (patch) | |
| tree | aef2f758edb9a79dff6828dcfc8e67aa6082ad7a | |
| parent | 9e6a3c984289978de7b8b794e309676b5cd15006 (diff) | |
| parent | 32e24cd670d15e0981e958e4d5a9639251f62769 (diff) | |
| download | zerocopy-android14-qpr2-s2-release.tar.gz | |
Snap for 11220357 from 32e24cd670d15e0981e958e4d5a9639251f62769 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: Ic337de5b54350f24494466ac039128cb8dc85df1
| -rw-r--r-- | cargo2rulesmk.json | 4 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 14 | ||||
| -rw-r--r-- | rules.mk | 20 |
3 files changed, 38 insertions, 0 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..d14b910 --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,4 @@ +{ + "features": "default,derive", + "patch": "patches/rules.mk.diff" +} diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..ecea77e --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,14 @@ +diff --git a/rules.mk b/rules.mk +index 05e4383..9e71d6d 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -8,8 +8,8 @@ MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + + MODULE_RUST_EDITION := 2018 ++# TODO(b/316076550): Remove rules.mk patch when cargo2rulesmk.py is fixed + MODULE_RUSTFLAGS += \ +- --cfg 'feature="byteorder"' \ + --cfg 'feature="default"' \ + --cfg 'feature="derive"' \ + --cfg 'feature="zerocopy-derive"' \ diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..9e71d6d --- /dev/null +++ b/rules.mk @@ -0,0 +1,20 @@ +# 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) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := zerocopy +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2018 +# TODO(b/316076550): Remove rules.mk patch when cargo2rulesmk.py is fixed +MODULE_RUSTFLAGS += \ + --cfg 'feature="default"' \ + --cfg 'feature="derive"' \ + --cfg 'feature="zerocopy-derive"' \ + +MODULE_LIBRARY_DEPS := \ + external/rust/crates/zerocopy-derive \ + +include make/library.mk |