Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: cb6bd18989 am: e395e59dc7 am: 5e7dd549e3 am: 9639305b28
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/csv/+/1912189
Change-Id: Iba3748e8c488a3c40d431749301caa8e9794bf36
diff --git a/Android.bp b/Android.bp
index 49e8234..bc895d5 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 {
@@ -41,6 +41,8 @@
name: "libcsv",
host_supported: true,
crate_name: "csv",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.1.6",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -51,19 +53,3 @@
"libserde",
],
}
-
-// dependent_library ["feature_list"]
-// bstr-0.2.15 "default,lazy_static,regex-automata,serde,serde1,serde1-nostd,std,unicode"
-// byteorder-1.4.3
-// csv-core-0.1.10 "default"
-// itoa-0.4.7 "default,std"
-// lazy_static-1.4.0
-// memchr-2.3.4 "std,use_std"
-// proc-macro2-1.0.26 "default,proc-macro"
-// quote-1.0.9 "default,proc-macro"
-// regex-automata-0.1.9
-// ryu-1.0.5
-// serde-1.0.125 "default,derive,serde_derive,std"
-// serde_derive-1.0.125 "default"
-// syn-1.0.68 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// unicode-xid-0.2.1 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 05c6d70..3cbd48d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,17 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "presubmit": [
+ "imports": [
{
- "name": "base64_device_test_tests_decode"
+ "path": "external/rust/crates/base64"
},
{
- "name": "base64_device_test_tests_encode"
+ "path": "external/rust/crates/tinytemplate"
},
{
- "name": "base64_device_test_tests_helpers"
+ "path": "external/rust/crates/tinyvec"
},
{
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "path": "external/rust/crates/unicode-xid"
}
]
}
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
