Merge pull request #1265 from owenv/owenv/androidvendor

Update vendor for android triples in fallback sdk

Author: owenv

Sources/SWBAndroidPlatform/Plugin.swift

@@ -307,7 +307,7 @@ fileprivate func androidSDKAdditionalCustomProperties(ndk: AndroidSDK.NDK, hostO
                     "MaximumDeploymentTarget": .plString("\(androidNdk.deploymentTargetRange.max)"),
                     "LLVMTargetTripleEnvironment": .plString("android"), // FIXME: androideabi for armv7!
                     "LLVMTargetTripleSys": .plString("linux"),
-                    "LLVMTargetTripleVendor": .plString("none"),
+                    "LLVMTargetTripleVendor": .plString("unknown"),
                 ])
             ]),
             "Toolchains": .plArray([

Tests/SWBAndroidPlatformTests/SWBAndroidPlatformTests.swift

@@ -263,7 +263,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("Ld"), .matchRuleItemPattern(.suffix(Path("build/Debug-android/libdynamiclib.so").str))) { task in
                     task.checkCommandLineMatches([
                         .suffix(clang.str),
-                        "-target", "\(arch)-none-linux-android\(minOS)",
+                        "-target", "\(arch)-unknown-linux-android\(minOS)",
                         "-shared",
                         "--sysroot",
                         .contains(Path("/toolchains/llvm/prebuilt/").str),
@@ -285,7 +285,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("Ld"), .matchRuleItemPattern(.suffix(Path("build/Debug-android/tool").str))) { task in
                     task.checkCommandLineMatches([
                         .suffix(clang.str),
-                        "-target", "\(arch)-none-linux-android\(minOS)",
+                        "-target", "\(arch)-unknown-linux-android\(minOS)",
                         "--sysroot", .contains(Path("/toolchains/llvm/prebuilt/").str),
                         "-resource-dir",
                         .and(.contains(Path("/toolchains/llvm/prebuilt/").str), .contains(Path("/lib/clang/").str)),
@@ -426,7 +426,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("Ld"), .matchRuleItemPattern(.suffix(Path("build/Debug-android/libdynamiclib.so").str))) { task in
                     task.checkCommandLineMatches([
                         .suffix(clang.str),
-                        "-target", "\(arch)-none-linux-android\(minOS)",
+                        "-target", "\(arch)-unknown-linux-android\(minOS)",
                         "-shared",
                         "--sysroot",
                         .contains(Path("/toolchains/llvm/prebuilt/").str),
@@ -451,7 +451,7 @@ fileprivate struct AndroidBuildOperationTests: CoreBasedTests {
                 results.checkTask(.matchRuleType("Ld"), .matchRuleItemPattern(.suffix(Path("build/Debug-android/tool").str))) { task in
                     task.checkCommandLineMatches([
                         .suffix(clang.str),
-                        "-target", "\(arch)-none-linux-android\(minOS)",
+                        "-target", "\(arch)-unknown-linux-android\(minOS)",
                         "--sysroot", .contains(Path("/toolchains/llvm/prebuilt/").str),
                         "-resource-dir",
                         .and(.contains(Path("/toolchains/llvm/prebuilt/").str), .contains(Path("/lib/clang/").str)),