diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-10 00:11:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-10 00:11:00 +0000 |
| commit | 99228446edff9e5ab2fa94b2cbe76dd893ecd17e (patch) | |
| tree | d16792d40392c3a91c704bda9c40369eda516d39 | |
| parent | 98d8b150ac8c0ec18059ec7de5c1d227116e3222 (diff) | |
| parent | d6e853ae9d87d4c84836abfda7aba754a48c6ecd (diff) | |
| download | der_derive-android14-qpr2-s2-release.tar.gz | |
Snap for 11078623 from d6e853ae9d87d4c84836abfda7aba754a48c6ecd 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: I5cc204c2c0c104061291aa25832b3331791b703f
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 7 | ||||
| -rw-r--r-- | cargo2rulesmk.json | 3 | ||||
| -rw-r--r-- | cargo_embargo.json | 12 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 12 | ||||
| -rw-r--r-- | rules.mk | 18 |
6 files changed, 46 insertions, 8 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index e8154a6..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "host-first-multilib": true, - "run": true, - "dep-suffixes": { - "syn": "_deprecated" - } -} 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/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..5e1c824 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,12 @@ +{ + "module_name_overrides": { + "libsyn": "libsyn_deprecated" + }, + "package": { + "der_derive": { + "device_supported": false, + "host_first_multilib": true + } + }, + "run_cargo": false +} 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 |