diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | cb6bd18989858b71f78650e2603abc4ff21ce22a (patch) | |
tree | 2ed96a9b679a0c51570d8606f3ce6088a8968e1e | |
parent | 132f4baebfa87033144a545797752e45c3aa08fb (diff) | |
parent | cb672b7b13a56d4d29f42654624618f68deb6059 (diff) | |
download | csv-cb6bd18989858b71f78650e2603abc4ff21ce22a.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 20 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 12 insertions, 25 deletions
@@ -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 @@ rust_library { 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 @@ rust_library { "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 |