diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-09 01:15:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-09 01:15:48 +0000 |
| commit | ef94d30d296352aec5e874f0c7c435ec545f6833 (patch) | |
| tree | d16792d40392c3a91c704bda9c40369eda516d39 | |
| parent | ba0d4f5e16a1e392f221d3c463fd42f241ff1ac0 (diff) | |
| parent | e254afc68bc0bb6a4ae5e54e5c20bc90a42db3da (diff) | |
| download | der_derive-ef94d30d296352aec5e874f0c7c435ec545f6833.tar.gz | |
Merge "Adding autogenerated Trusty makefile rules" into main am: 0cb143147d am: e254afc68b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der_derive/+/2753231
Change-Id: Ied6518d20e8360bb003dd956888231e7173c0647
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 | 12 | ||||
| -rw-r--r-- | rules.mk | 18 |
3 files changed, 33 insertions, 0 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..01f7467 --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,3 @@ +{ + "patch": "patches/rules.mk.diff" +} diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..e3bbe54 --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,12 @@ +diff --git b/rules.mk a/rules.mk +index 60a751a..7369647 100644 +--- b/rules.mk ++++ a/rules.mk +@@ -13,6 +13,6 @@ MODULE_LIBRARY_DEPS := \ + external/rust/crates/proc-macro-error \ + external/rust/crates/proc-macro2 \ + external/rust/crates/quote \ +- external/rust/crates/syn \ ++ external/rust/crates/syn/1.0.107 \ + + include make/library.mk diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..f9daabd --- /dev/null +++ b/rules.mk @@ -0,0 +1,18 @@ +# 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_derive +MODULE_RUST_CRATE_TYPES := proc-macro +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2021 +MODULE_LIBRARY_DEPS := \ + external/rust/crates/proc-macro-error \ + external/rust/crates/proc-macro2 \ + external/rust/crates/quote \ + external/rust/crates/syn/1.0.107 \ + +include make/library.mk |