From 08798aae0b51cae802b0ae636a11e9f04216ea0f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 27 Feb 2020 13:12:46 +0000 Subject: [PATCH] Add windows to the list of available OS's in sdk tests Makes the tests more realistic as they cover what happens when an sdk OS specific variant is disabled (Windows is disabled by default). This will allow issues around disabled variants to be detected early during Soong bootstrapping. Test: m nothing Change-Id: I7ec47dbca52e38750166d755daf706aadea12d15 --- sdk/testing.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk/testing.go b/sdk/testing.go index ae0620d83..7352c7444 100644 --- a/sdk/testing.go +++ b/sdk/testing.go @@ -61,6 +61,12 @@ func testSdkContext(bp string, fs map[string][]byte) (*android.TestContext, andr config := android.TestArchConfig(buildDir, nil, bp, mockFS) + // Add windows as a default disable OS to test behavior when some OS variants + // are disabled. + config.Targets[android.Windows] = []android.Target{ + {android.Windows, android.Arch{ArchType: android.X86_64}, android.NativeBridgeDisabled, "", ""}, + } + ctx := android.NewTestArchContext() // from android package