Merge pull request #315 from swiftlang/eng/fix-apinotes-android-install

[android] fix the android posix_filesystem.apinote file installation

Author: hyp

platforms/Windows/android_sdk/android_sdk.wxs

@@ -110,7 +110,6 @@
                     </Directory>
                   </Directory>
                 </Directory>
-                <Directory Id="AndroidSDK_usr_share" Name="share" />
               </Directory>
             </Directory>
           </Directory>
@@ -1169,6 +1168,9 @@
       <Component>
         <File Source="$(SDK_ROOT)\usr\lib\swift\apinotes\std.apinotes" />
       </Component>
+      <Component>
+        <File Source="$(SDK_ROOT)\usr\lib\swift\apinotes\posix_filesystem.apinotes" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="libcxxshim" Directory="AndroidSDK_usr_lib_swift_android">
@@ -1189,12 +1191,6 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="AuxiliaryFiles" Directory="AndroidSDK_usr_share">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\share\posix_filesystem.apinotes" />
-      </Component>
-    </ComponentGroup>
-
     <ComponentGroup Id="Configuration">
       <Component Directory="AndroidSDK">
         <File Source="$(SDK_ROOT)\SDKSettings.plist" />
@@ -1236,7 +1232,6 @@
       <ComponentGroupRef Id="apinotes" />
       <ComponentGroupRef Id="libcxxshim" />
       <ComponentGroupRef Id="Registrar" />
-      <ComponentGroupRef Id="AuxiliaryFiles" />
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />