Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 99dc3539da am: 12984bfa87
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt-derive/+/1912697
Change-Id: Ie7e9f0f5a869c4f9bbd1f38eaa18deff8d01bd38
diff --git a/Android.bp b/Android.bp
index cd2b353..2b0bac2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -54,24 +54,3 @@
"libsyn",
],
}
-
-rust_test_host {
- name: "structopt-derive_host_test_src_lib",
- crate_name: "structopt_derive",
- cargo_env_compat: true,
- cargo_pkg_version: "0.4.16",
- srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2018",
- rustlibs: [
- "libheck",
- "libproc_macro2",
- "libproc_macro_error",
- "libquote",
- "libsyn",
- ],
-}
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..341300b
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
