Fix the Testing/XCTest SDK file paths

Author: hjyamauchi

platforms/Windows/sdk/drd/sdk.wxs

@@ -3,28 +3,15 @@
 
   <?if $(ProductArchitecture) = "arm64"?>
     <?define Architecture = "aarch64"?>
-    <?define SwiftModuleTriple = "aarch64-unknown-linux-android"?>
     <?define Triple = "aarch64-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "amd64"?>
     <?define Architecture = "x86_64"?>
-    <?define SwiftModuleTriple = "x86_64-unknown-linux-android"?>
     <?define Triple = "x86_64-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "arm"?>
     <?define Architecture = "armv7"?>
-    <!--
-      The Swift compiler outputs Android armv7 .swiftdoc, .swiftmodule, and
-      .swiftinterface files with the name armv7-unknown-linux-android. Since the
-      correct triple is armv7-unknown-linux-androideabi, define two constants to
-      deal with the inconsistency.
-
-      TODO: consider updating Swift compiler to output file names matching the
-      correct triple.
-    -->
-    <?define SwiftModuleTriple = "armv7-unknown-linux-androideabi"?>
     <?define Triple = "armv7-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "x86"?>
     <?define Architecture = "i686"?>
-    <?define SwiftModuleTriple = "i686-unknown-linux-android"?>
     <?define Triple = "i686-unknown-linux-android"?>
   <?endif?>
 
@@ -151,19 +138,19 @@
 
     <ComponentGroup Id="XCTest">
       <Component Directory="XCTest_usr_lib_swift_android_ARCH">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\libXCTest.so" />
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\$(Architecture)\libXCTest.so" />
       </Component>
       <Component Directory="XCTest.swiftmodule">
-        <File Name="$(Triple).swiftdoc" Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\$(Architecture)\XCTest.swiftdoc" />
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\XCTest.swiftmodule\$(Triple).swiftdoc" />
       </Component>
       <Component Directory="XCTest.swiftmodule">
-        <File Name="$(Triple).swiftmodule" Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\$(Architecture)\XCTest.swiftmodule" />
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\XCTest.swiftmodule\$(Triple).swiftmodule" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="Testing">
       <Component Directory="Testing_usr_lib_swift_android_ARCH">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\libTesting.so" />
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\$(Architecture)\libTesting.so" />
       </Component>
       <Component Directory="Testing.swiftmodule">
         <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
@@ -176,7 +163,7 @@
     <ComponentGroup Id="DS2">
       <?if $(ANDROID_INCLUDE_DS2) == true ?>
         <Component Directory="_ds2_usr_bin">
-          <File Source="$(PLATFORM_ROOT)\Developer\Library\ds\usr\bin\$(SwiftModuleTriple)-ds2" />
+          <File Source="$(PLATFORM_ROOT)\Developer\Library\ds\usr\bin\$(Triple)-ds2" />
         </Component>
       <?endif?>
     </ComponentGroup>