diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:11 +0000 |
| commit | ca1ebcc270db869099c84b08e37b55f6587766b7 (patch) | |
| tree | 2ccd9749d9200a75c61d8eac6ff497db8edb72a1 | |
| parent | 97d6681a4d123a9d56b1fcf23e4f55339cb75645 (diff) | |
| parent | bd8cddb34ead8ac0e436343d2c72ee7bd1337815 (diff) | |
| download | vsock-ca1ebcc270db869099c84b08e37b55f6587766b7.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a5341a6140 am: 2b850fd536 am: 4d3f891433 am: bd8cddb34e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1912872
Change-Id: I1b3f7254a09e3f29f107e92c8683efe48e602fb9
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | TEST_MAPPING | 8 | ||||
| -rw-r--r-- | cargo2android.json | 2 |
3 files changed, 11 insertions, 7 deletions
@@ -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 |