-sdk for Android (Take 3)

[SDGGiesbrecht]

This is a further narrowing of #2620. It now only changes anything when building for Android. It merely adds || triple.isAndroid().

The local variable of triple was necessary because || involves an implicit closure and would result in an error if the instance property were used directly:

'self' captured by a closure before all members were initialized

[aciidgh]

@SDGGiesbrecht LGTM but do you think it's possible to add a unit test for this? I want to avoid having these changes regress unintentionally.

[SDGGiesbrecht]

Sure. Just a minute.

[SDGGiesbrecht]

Done.

Destination’s synthesized initializer was unavailable from the test module, so I had to add a manual one.

[aciidgh]

Thanks!

[aciidgh]

@swift-ci smoke test

[SDGGiesbrecht]

I see the failure. Looking into it.

[SDGGiesbrecht]

On Linux it was attempting to validate the toolchain, while I was only giving it a mock value. I switched it to use the standard toolchain from Resources.default.

[aciidgh]

@swift-ci smoke test

[aciidgh]

@shahmishal can you give @SDGGiesbrecht commit/swift-ci trigger access?

[aciidgh]

@swift-ci smoke test linux

[aciidgh]

Oh the error seems related:

09:15:45 Test Case 'WorkspaceTests.testAndroidCompilerFlags' started at 2020-03-02 17:15:22.197
09:15:45 
<EXPR>:0: error: WorkspaceTests.testAndroidCompilerFlags : threw error "toolchain is invalid: Missing tool swiftc"
09:15:45 Test Case 'WorkspaceTests.testAndroidCompilerFlags' failed (0.022 seconds)
09:15:45 Test Suite 'WorkspaceTests' failed at 2020-03-02 17:15:22.219
0

[SDGGiesbrecht]

Backing up the stack, the error is from:

• Line 95 in UserToolchain.findProgram(_:envSearchPaths:), called from
• Line 127 of UserToolchain.determineSwiftCompilers(binDir:lookup:envSearchPaths:), which is when there is no swiftc in the toolchain’s bin and there is no SWIFT_EXEC, called from
• Line 238 of UserToolchain.init(destination:environment:) which is telling it to look in PATH.

So this test fails or not merely based on whether swiftc is available in PATH when the toolchain tries to validate itself. That makes it really complicated to reproduce locally.

I have narrowed the test by factoring the flag derivation out of the initializer and testing it in isolation. That way there is no UserToolchain instance trying to validate itself whatsoever. I think that should fix it, but then I never could reproduce the previous failures locally either.

[aciidgh]

@swift-ci smoke test

[SDGGiesbrecht]

Finally, a green checkmark.

[aciidgh]

Thanks for the fix!