diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-10 00:10:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-10 00:10:59 +0000 |
| commit | 5bb065fdc5ead5a3a7273a9c321336b393e3a4c3 (patch) | |
| tree | 58903cf8a975deec489ba580fc0b380134ff8f72 | |
| parent | a38d2a6b043c2dbbcb630f958e74e318f7aea6e9 (diff) | |
| parent | 12450de673963f7edeb578933b73f0db8533682f (diff) | |
| download | der-5bb065fdc5ead5a3a7273a9c321336b393e3a4c3.tar.gz | |
Snap for 11078623 from 12450de673963f7edeb578933b73f0db8533682f to 24Q1-release
Change-Id: Iab01afdc38f9d7d7591212be26f051aa14088931
| -rw-r--r-- | cargo2rulesmk.json | 4 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 16 | ||||
| -rw-r--r-- | rules.mk | 26 |
3 files changed, 46 insertions, 0 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..46cd2ac --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,4 @@ +{ + "features": "alloc,derive,flagset,oid,zeroize", + "patch": "patches/rules.mk.diff" +} diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..3c0a6f6 --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,16 @@ +diff --git b/rules.mk a/rules.mk +index 838754b..19beb65 100644 +--- b/rules.mk ++++ a/rules.mk +@@ -18,7 +18,9 @@ MODULE_RUSTFLAGS += \ + --cfg 'feature="zeroize"' \ + + MODULE_LIBRARY_DEPS := \ +- external/rust/crates/pem-rfc7468 \ +- external/rust/crates/time \ ++ external/rust/crates/const-oid \ ++ external/rust/crates/der_derive \ ++ external/rust/crates/flagset \ ++ external/rust/crates/zeroize \ + + include make/library.mk diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..19beb65 --- /dev/null +++ b/rules.mk @@ -0,0 +1,26 @@ +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features . +# Do not modify this file as changes will be overridden on upgrade. + +LOCAL_DIR := $(GET_LOCAL_DIR) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := der +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2021 +MODULE_RUSTFLAGS += \ + --cfg 'feature="alloc"' \ + --cfg 'feature="const-oid"' \ + --cfg 'feature="der_derive"' \ + --cfg 'feature="derive"' \ + --cfg 'feature="flagset"' \ + --cfg 'feature="oid"' \ + --cfg 'feature="zeroize"' \ + +MODULE_LIBRARY_DEPS := \ + external/rust/crates/const-oid \ + external/rust/crates/der_derive \ + external/rust/crates/flagset \ + external/rust/crates/zeroize \ + +include make/library.mk |