summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 17:27:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 17:27:44 +0000
commitdfe834cc87b8c5cafd8d5f320ad4c66803373ece (patch)
tree1ceb95826c8fa8209af6a52ceb219fd1fdcc743a
parent5712c4b25f9e6ef3efae3e48212317ec27e4caf8 (diff)
parentb1d2c4fef329608cbe16bc32387c602e71348709 (diff)
downloadcodespan-reporting-dfe834cc87b8c5cafd8d5f320ad4c66803373ece.tar.gz
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: 6ec5756af4 am: 6046aa3481 am: b1d2c4fef3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/codespan-reporting/+/1912186 Change-Id: Ic2bbbeedb9a04d0f429fa9601123c2d4ac95df45
-rw-r--r--Android.bp8
-rw-r--r--TEST_MAPPING25
-rw-r--r--cargo2android.json4
3 files changed, 32 insertions, 5 deletions
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 @@ rust_library {
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 @@ rust_library {
"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