Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4be8607c62 am: 2e531088a9 am: 12248a1cda am: cdcdcf6d7e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/which/+/1912836
Change-Id: I64ec07f6c8f507ef44616409a7f8e2532f6cc672
diff --git a/Android.bp b/Android.bp
index ef770b4..9ab98c9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --features=.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -22,6 +22,8 @@
name: "libwhich",
host_supported: true,
crate_name: "which",
+ cargo_env_compat: true,
+ cargo_pkg_version: "4.2.2",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -29,7 +31,3 @@
"liblibc",
],
}
-
-// dependent_library ["feature_list"]
-// either-1.6.1 "default,use_std"
-// libc-0.2.98 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d87563d..e4ec3b3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,17 +1,24 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ }
+ ],
"presubmit": [
{
"name": "keystore2_test"
},
{
"name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
- },
- {
- "name": "libsqlite3_bindgen_test"
+ "name": "legacykeystore_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..5fd6c55
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "device": true,
+ "features": "",
+ "run": true
+}
\ No newline at end of file
