Snap for 8006021 from a904df74449bfdec5ff2413e0d27521a2a14e61f to tm-release
Change-Id: Ia934a9799269b18c646c60dabebe102e9a9afe73
diff --git a/Android.bp b/Android.bp
index 363deca..8e6090a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --host-first-multilib.
+// 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: [
@@ -40,7 +41,10 @@
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",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -48,24 +52,12 @@
"syn",
"syn-error",
],
- flags: [
- "--cfg skip_ui_tests",
- ],
+ cfgs: ["use_fallback"],
rustlibs: [
"libproc_macro2",
"libquote",
"libsyn",
],
- proc_macros: [
- "libproc_macro_error_attr",
- ],
+ proc_macros: ["libproc_macro_error_attr"],
compile_multilib: "first",
}
-
-// dependent_library ["feature_list"]
-// proc-macro-error-attr-1.0.4
-// proc-macro2-1.0.23 "default,proc-macro"
-// quote-1.0.7 "default,proc-macro"
-// syn-1.0.42 "clone-impls,default,derive,parsing,printing,proc-macro,quote,visit"
-// 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"
- },
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "base64_device_test_tests_decode"
- },
- {
- "name": "base64_device_test_tests_encode"
- },
- {
- "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..bb77633
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+ "host-first-multilib": true,
+ "run": true
+}
\ No newline at end of file