diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:34 +0000 |
commit | 9169f5f50b5ca9705f1da7c1f084618729c9527e (patch) | |
tree | 5df0ee1806e8979bef6a5a794f81a2b1452d7fa3 | |
parent | 8717eaab2cf92b1e831a8f4d3d9ebde2c6896fcc (diff) | |
parent | 4eca9ea8bef9a2ecd04957fd42a7db0270ccb86e (diff) | |
download | csv-core-9169f5f50b5ca9705f1da7c1f084618729c9527e.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4eca9ea8be
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/csv-core/+/1912599
Change-Id: I9ad7dfd8675c86aaa6b9c7dc1407a0f4dc831953
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 12 insertions, 12 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 { @@ -42,6 +42,8 @@ rust_library { name: "libcsv_core", host_supported: true, crate_name: "csv_core", + cargo_env_compat: true, + cargo_pkg_version: "0.1.10", srcs: ["src/lib.rs"], edition: "2018", features: ["default"], @@ -49,6 +51,3 @@ rust_library { "libmemchr", ], } - -// dependent_library ["feature_list"] -// memchr-2.3.4 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 |