diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:17 +0000 |
| commit | 7e589d6583b5acf1dda082459a0cb768735c78e0 (patch) | |
| tree | 5095c6595cb46e57f744d383de008ac3e173bf4c | |
| parent | 7d3dfd4cd09a837c04bd25154ecc7aebfafd06f3 (diff) | |
| parent | 4d183ff2a67aee84adeaea46ddb1abf3a787f6f3 (diff) | |
| download | proc-macro-error-attr-7e589d6583b5acf1dda082459a0cb768735c78e0.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d183ff2a6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error-attr/+/1912657
Change-Id: Ia44652fabca74701d6a6de8e60ae5e3d1ae6dd69
| -rw-r--r-- | Android.bp | 24 | ||||
| -rw-r--r-- | TEST_MAPPING | 17 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 18 insertions, 28 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --host-first-multilib --tests. +// This file is generated by cargo2android.py --config cargo2android.json. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: [ @@ -41,6 +42,8 @@ license { rust_proc_macro { name: "libproc_macro_error_attr", crate_name: "proc_macro_error_attr", + cargo_env_compat: true, + cargo_pkg_version: "1.0.4", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -49,22 +52,3 @@ rust_proc_macro { ], compile_multilib: "first", } - -rust_test_host { - name: "proc-macro-error-attr_host_test_src_lib", - crate_name: "proc_macro_error_attr", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - rustlibs: [ - "libproc_macro2", - "libquote", - ], -} - -// dependent_library ["feature_list"] -// proc-macro2-1.0.23 "default,proc-macro" -// quote-1.0.7 "default,proc-macro" -// unicode-xid-0.2.1 "default" -// version_check-0.9.2 diff --git a/TEST_MAPPING b/TEST_MAPPING index d364321..8029a19 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,17 +1,18 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/base64" + } + ], "presubmit": [ { "name": "authfs_device_test_src_lib" - }, - { - "name": "base64_device_test_tests_decode" - }, - { - "name": "base64_device_test_tests_encode" - }, + } + ], + "presubmit-rust": [ { - "name": "base64_device_test_tests_helpers" + "name": "authfs_device_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..b360f74 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "host-first-multilib": true, + "run": true, + "tests": true +}
\ No newline at end of file |