From 1921e8003dd4e2a622e85ac1653f1fb3a683e569 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Thu, 20 May 2021 13:39:16 -0400 Subject: Rust cdylib/statliclib support for vendor snapshot. Adds support for platform vendor_available Rust FFI libraries and binaries to be included in the vendor snapshot. Because rlib and dylibs are not yet in snapshots, libstd cannot be included in a vendor snapshot. As a result, vendor-specific Rust code can't be guaranteed to work with the platform-provided vendor_available modules built with a newer toolchain. For now, a check is added indicating vendor-specific Rust code is unsupported. This changes the linkage for vendor variants of these modules to default to rlib linkage since dylibs cannot be included in the snapshot yet. Bug: 184042776 Test: m nothing # new Soong tests pass Change-Id: I502eaa4bb962eb87ff868fcf49b435f0d2f982e6 --- rust/testing.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'rust/testing.go') diff --git a/rust/testing.go b/rust/testing.go index a0f86b220..a7cbf54d8 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -45,6 +45,11 @@ var PrepareForIntegrationTestWithRust = android.GroupFixturePreparers( PrepareForTestWithRustDefaultModules, ) +var PrepareForTestWithRustIncludeVndk = android.GroupFixturePreparers( + PrepareForIntegrationTestWithRust, + cc.PrepareForTestWithCcIncludeVndk, +) + func GatherRequiredDepsForTest() string { bp := ` rust_prebuilt_library { -- cgit v1.2.3-59-g8ed1b