aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 16:02:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 16:02:09 +0000
commit05dc48924e76653212fa76de0c768316e41a8a55 (patch)
tree45b9583a7abf0e76ea90a4321713dc2f1d78d9bc
parentbb01b1a81983754feac2671a5497f35ef82a04c7 (diff)
parentdb8a5764cdc6c0fa88187a5b48466e60965d0f6a (diff)
downloadbyteorder-05dc48924e76653212fa76de0c768316e41a8a55.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: db8a5764cd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/byteorder/+/1912434 Change-Id: Ic00416c5e45ac1a6917561929d173a177ef3f7f6
-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