aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-15 04:06:33 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-15 04:06:33 +0000
commita2db4d8829c3dc30f0e2d2996a738b6131d2b845 (patch)
tree2ccd9749d9200a75c61d8eac6ff497db8edb72a1
parent97d6681a4d123a9d56b1fcf23e4f55339cb75645 (diff)
parentca1ebcc270db869099c84b08e37b55f6587766b7 (diff)
downloadvsock-a2db4d8829c3dc30f0e2d2996a738b6131d2b845.tar.gz
Snap for 8183730 from ca1ebcc270db869099c84b08e37b55f6587766b7 to udc-release
Change-Id: I7988399067e901a14845bab767aacf5c87a265d1
-rw-r--r--Android.bp8
-rw-r--r--TEST_MAPPING8
-rw-r--r--cargo2android.json2
3 files changed, 11 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 3022ab7..b2544e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@ rust_library {
name: "libvsock",
host_supported: true,
crate_name: "vsock",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.4",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -33,9 +35,3 @@ rust_library {
"com.android.virt",
],
}
-
-// dependent_library ["feature_list"]
-// bitflags-1.2.1 "default"
-// cfg-if-1.0.0
-// libc-0.2.98 "default,extra_traits,std"
-// nix-0.19.1
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ab8f416..b7c1df9 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,5 +7,13 @@
{
"name": "virtualizationservice_device_test"
}
+ ],
+ "presubmit-rust": [
+ {
+ "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