Snap for 8564071 from 491a05717d51ae340c3311564ba4b7d1730ec797 to mainline-os-statsd-release
Change-Id: I4484d081dfa562e1a0b9e9cd8a1d4b15eebf358c
diff --git a/Android.bp b/Android.bp
index 4599357..78255f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device.
+// 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: ["external_rust_crates_glob_license"],
@@ -41,6 +42,8 @@
// has rustc warnings
host_supported: true,
crate_name: "glob",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.3.0",
srcs: ["src/lib.rs"],
edition: "2015",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6716814..a28acb0 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,30 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ }
+ ],
"presubmit": [
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "microdroid_manager_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+ "device": true,
+ "run": true
+}
\ No newline at end of file
