From 6a7e953e62a5c44c682281162cb6fb4ad6584fe1 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 20 Mar 2020 17:50:07 +0000 Subject: Sdk snapshot set compile_multilib per OsType Previously, when an sdk snapshot only supported a single os type the compile_multilib was set based on the multilib usages by the members of that variant. After the change to support multiple os types per snapshot the multilib setting was based on the multilib usages across all the members of all sdk variants. That meant that if one os type used only "64" and the other used "both" then they would both be treated as "both" leading to missing variants when the snapshot was unpacked. This change tracks the multilib usages per os type and adds a property for each one. It intentionally changes a couple of tests: 1) Either by adding compile_multilib that is missing. 2) By targeting it at a specific os type instead of host. The latter change is important to prevent the snapshot from being used on a host platform (which will match the host target section) but which is a different os type to the ones supported by the snapshot. Bug: 142935992 Test: m nothing Change-Id: I883919b644292c3d019db223bb4fd5c11b39591f --- sdk/cc_sdk_test.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'sdk/cc_sdk_test.go') diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 27a951865..ca40afd04 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -553,6 +553,11 @@ module_exports_snapshot { device_supported: false, host_supported: true, native_binaries: ["myexports_mynativebinary@current"], + target: { + windows: { + compile_multilib: "64", + }, + }, } `), checkAllCopyRules(` @@ -1013,6 +1018,11 @@ sdk_snapshot { device_supported: false, host_supported: true, native_shared_libs: ["mysdk_mynativelib@current"], + target: { + windows: { + compile_multilib: "64", + }, + }, } `), checkAllCopyRules(` @@ -1358,7 +1368,7 @@ module_exports_snapshot { host_supported: true, native_static_libs: ["myexports_mynativelib@current"], target: { - host: { + linux_glibc: { compile_multilib: "64", }, }, -- cgit v1.2.3-59-g8ed1b