aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 17:27:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 17:27:18 +0000
commitfdb9e00f1dbfc1acb0477018d7c97f7aa05a6fb2 (patch)
tree45b9583a7abf0e76ea90a4321713dc2f1d78d9bc
parent1c485f363b4ef24f146502976c958a036077fa1e (diff)
parent9323008658ed7c46eca86af890afe8a349151252 (diff)
downloadbyteorder-fdb9e00f1dbfc1acb0477018d7c97f7aa05a6fb2.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: db8a5764cd am: 05dc48924e am: 9323008658
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/byteorder/+/1912434 Change-Id: Ie3d326e3ada4f1cc75be066bcb8f76237676aa84
-rw-r--r--Android.bp2
-rw-r--r--TEST_MAPPING23
-rw-r--r--cargo2android.json2
3 files changed, 26 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 33ab447..4412e92 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,8 @@ rust_library {
name: "libbyteorder",
host_supported: true,
crate_name: "byteorder",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.3",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 306a2fb..2868693 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -22,5 +22,28 @@
{
"name": "virtualizationservice_device_test"
}
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "libidsig.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 5c18d15..42b7833 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,4 +6,4 @@
"dependencies": true,
"device": true,
"run": true
-}
+} \ No newline at end of file