Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 0d50aaa..8e1f3e7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@
name: "libzip",
host_supported: true,
crate_name: "zip",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.5.13",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -39,19 +41,3 @@
"com.android.virt",
],
}
-
-// dependent_library ["feature_list"]
-// byteorder-1.4.3 "default,std"
-// cc-1.0.68
-// cfg-if-1.0.0
-// crc32fast-1.2.1 "default,std"
-// flate2-1.0.20 "any_zlib,libz-sys,zlib"
-// libc-0.2.97 "default,std"
-// libz-sys-1.1.3
-// pkg-config-0.3.19
-// proc-macro2-1.0.27 "default,proc-macro"
-// quote-1.0.9 "default,proc-macro"
-// syn-1.0.73 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// thiserror-1.0.25
-// thiserror-impl-1.0.25
-// unicode-xid-0.2.2 "default"
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 425cfef..51581bb 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,4 +7,4 @@
"device": true,
"features": "deflate-zlib",
"run": true
-}
+}
\ No newline at end of file
