aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 17:27:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 17:27:19 +0000
commit3252cded4b7668899a563922ebf21251abf9fc13 (patch)
treed20614eeedc5d5cb9ddd08b43270680211ecb5a1
parenteacf0bbd05b6715af30384121551376ecc579050 (diff)
parent8af04a6a47dd2d656f5d069656a3cc653f1ed006 (diff)
downloadflate2-3252cded4b7668899a563922ebf21251abf9fc13.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 2ce4f4b476 am: 7aef4d7a59 am: 8af04a6a47
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/flate2/+/1912623 Change-Id: I0e85aa9e78b0d7507a165a6f9acecbb487f6061c
-rw-r--r--TEST_MAPPING17
-rw-r--r--cargo2android.json2
2 files changed, 18 insertions, 1 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 82662b1..7325ef4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -16,5 +16,22 @@
{
"name": "virtualizationservice_device_test"
}
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
]
}
diff --git a/cargo2android.json b/cargo2android.json
index e888e21..85a6aa6 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,4 +6,4 @@
"device": true,
"features": "zlib",
"run": true
-}
+} \ No newline at end of file