Snap for 8191477 from 93811adba65b092b62f61b874fddededd5640e72 to tm-frc-resolv-release
Change-Id: I5ac47dd871476a3dddc7e72b03eab4bfb1e0a808
diff --git a/Android.bp b/Android.bp
index 8f99540..e18e9ee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -24,6 +24,8 @@
name: "libcodespan_reporting",
host_supported: true,
crate_name: "codespan_reporting",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.11.1",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -31,7 +33,3 @@
"libunicode_width",
],
}
-
-// dependent_library ["feature_list"]
-// termcolor-1.1.2
-// unicode-width-0.1.8 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..a3af1cf
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,25 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+ "presubmit": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_vintf_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_vintf_test"
+ },
+ {
+ "name": "legacykeystore_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
