rename android condition defines

Author: hyp

platforms/Windows/bundle/installer.wixproj

@@ -8,10 +8,10 @@
       $(DefineConstants);
       INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
       INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
-      INCLUDE_ARM64_ANDROID_SDK=$(INCLUDE_ARM64_ANDROID_SDK);
-      INCLUDE_x86_64_ANDROID_SDK=$(INCLUDE_x86_64_ANDROID_SDK);
-      INCLUDE_ARM_ANDROID_SDK=$(INCLUDE_ARM_ANDROID_SDK);
-      INCLUDE_X86_ANDROID_SDK=$(INCLUDE_X86_ANDROID_SDK);
+      ANDROID_INCLUDE_ARM64_SDK=$(ANDROID_INCLUDE_ARM64_SDK);
+      ANDROID_INCLUDE_x86_64_SDK=$(ANDROID_INCLUDE_x86_64_SDK);
+      ANDROID_INCLUDE_ARM_SDK=$(ANDROID_INCLUDE_ARM_SDK);
+      ANDROID_INCLUDE_X86_SDK=$(ANDROID_INCLUDE_X86_SDK);
     </DefineConstants>
   </PropertyGroup>
 
@@ -36,19 +36,19 @@
     <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="sdk_arm64" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_ARM64_ANDROID_SDK)' != '' ">
+  <ItemGroup Condition=" '$(ANDROID_INCLUDE_ARM64_SDK)' != '' ">
     <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_sdk_aarch64" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_x86_64_ANDROID_SDK)' != '' ">
+  <ItemGroup Condition=" '$(ANDROID_INCLUDE_x86_64_SDK)' != '' ">
     <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_sdk_x86_64" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_ARM_ANDROID_SDK)' != '' ">
+  <ItemGroup Condition=" '$(ANDROID_INCLUDE_ARM_SDK)' != '' ">
     <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_sdk_armv7" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_X86_ANDROID_SDK)' != '' ">
+  <ItemGroup Condition=" '$(ANDROID_INCLUDE_X86_SDK)' != '' ">
     <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_sdk_i686" />
   </ItemGroup>
 </Project>

platforms/Windows/bundle/installer.wxs

@@ -124,7 +124,7 @@
         </MsiPackage>
       <?endif?>
 
-      <?if $(INCLUDE_ARM64_ANDROID_SDK) == true ?>
+      <?if $(ANDROID_INCLUDE_ARM64_SDK) == true ?>
         <MsiPackage
           SourceFile="!(bindpath.android_sdk_aarch64)\android_sdk.aarch64.msi"
           InstallCondition="OptionsInstallAndroidSdkArm64"
@@ -133,7 +133,7 @@
         </MsiPackage>
       <?endif?>
 
-      <?if $(INCLUDE_x86_64_ANDROID_SDK) == true ?>
+      <?if $(ANDROID_INCLUDE_x86_64_SDK) == true ?>
         <MsiPackage
           SourceFile="!(bindpath.android_sdk_x86_64)\android_sdk.x86_64.msi"
           InstallCondition="OptionsInstallAndroidSdkAMD64"
@@ -142,7 +142,7 @@
         </MsiPackage>
       <?endif?>
 
-      <?if $(INCLUDE_ARM_ANDROID_SDK) == true ?>
+      <?if $(ANDROID_INCLUDE_ARM_SDK) == true ?>
         <MsiPackage
           SourceFile="!(bindpath.android_sdk_armv7)\android_sdk.armv7.msi"
           InstallCondition="OptionsInstallAndroidSdkArm"
@@ -151,7 +151,7 @@
         </MsiPackage>
       <?endif?>
 
-      <?if $(INCLUDE_X86_ANDROID_SDK) == true ?>
+      <?if $(ANDROID_INCLUDE_X86_SDK) == true ?>
         <MsiPackage
           SourceFile="!(bindpath.android_sdk_i686)\android_sdk.i686.msi"
           InstallCondition="OptionsInstallAndroidSdkX86"