Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d713000e27 am: 5d63966955 am: 1e37f23127 am: d4a89d2db6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1912047
Change-Id: I1644e1dd60ee05b5474b8dd29043e001a91c9954
diff --git a/Android.bp b/Android.bp
index 95aa797..e0534ba 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -41,19 +41,11 @@
name: "libcexpr",
host_supported: true,
crate_name: "cexpr",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.5.0",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
"libnom",
],
}
-
-// dependent_library ["feature_list"]
-// bitvec-0.19.5 "alloc,std"
-// funty-1.1.0
-// memchr-2.3.4 "std,use_std"
-// nom-6.2.0 "alloc,bitvec,funty,std"
-// radium-0.5.3
-// tap-1.0.1
-// version_check-0.9.3
-// wyz-0.2.0 "alloc"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d87563d..e4ec3b3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,17 +1,24 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ }
+ ],
"presubmit": [
{
"name": "keystore2_test"
},
{
"name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
- },
- {
- "name": "libsqlite3_bindgen_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
