diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-22 21:41:50 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-22 21:41:50 +0000 |
| commit | 54ade1bf0eb52929538d791e41de42d31184f362 (patch) | |
| tree | 1f432b33bce93aa057324fc01813da78c7d79f45 | |
| parent | ea8ac8862969f6031800954eaeed3b3c71675755 (diff) | |
| parent | 230dba8205e6f65e401786f4082a7e55b11cc8ee (diff) | |
| download | proc-macro-error-simpleperf-release.tar.gz | |
Snap for 11135399 from 230dba8205e6f65e401786f4082a7e55b11cc8ee to simpleperf-releasesimpleperf-release
Change-Id: I4bbf576f7c46dfac2af1194fc5f7496aba36becb
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | cargo2android.json | 4 | ||||
| -rw-r--r-- | cargo2rulesmk.json | 3 | ||||
| -rw-r--r-- | cargo_embargo.json | 8 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 11 | ||||
| -rw-r--r-- | rules.mk | 23 |
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 { @@ -41,7 +41,6 @@ license { rust_library_host { name: "libproc_macro_error", - // has rustc warnings crate_name: "proc_macro_error", cargo_env_compat: true, cargo_pkg_version: "1.0.4", @@ -60,6 +59,4 @@ rust_library_host { ], proc_macros: ["libproc_macro_error_attr"], compile_multilib: "first", - product_available: true, - vendor_available: true, } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index bb77633..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "host-first-multilib": true, - "run": true -}
\ No newline at end of file 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..887288a --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "package": { + "proc-macro-error": { + "device_supported": false, + "host_first_multilib": true + } + } +} diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..dfe4a6d --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,11 @@ +diff --git a/rules.mk b/rules.mk +index 4f4804c..ff3d072 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -18,5 +18,6 @@ MODULE_LIBRARY_DEPS := \ + external/rust/crates/proc-macro-error-attr \ + external/rust/crates/proc-macro2 \ + external/rust/crates/quote \ ++ external/rust/crates/syn \ + + include make/library.mk diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..7bc8377 --- /dev/null +++ b/rules.mk @@ -0,0 +1,23 @@ +# 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 := proc_macro_error +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2018 +MODULE_RUSTFLAGS += \ + --cfg 'feature="default"' \ + --cfg 'feature="syn"' \ + --cfg 'feature="syn-error"' \ + --cfg 'skip_ui_tests' \ + +MODULE_LIBRARY_DEPS := \ + external/rust/crates/proc-macro-error-attr \ + external/rust/crates/proc-macro2 \ + external/rust/crates/quote \ + external/rust/crates/syn \ + +include make/library.mk |