Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 974e876..010a3be 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 @@
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 @@
],
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"
- },
+ }
+ ],
+ "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..b360f74
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "host-first-multilib": true,
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
