From ec6c2ea2c05a82ef3f0f7550e124101b1dc244dc Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Tue, 21 May 2024 20:32:41 -0700 Subject: [PATCH 01/11] Add android SDK installer support --- .../Windows/SideBySideUpgradeStrategy.props | 2 + .../Windows/android_sdk/android_sdk.wixproj | 28 + platforms/Windows/android_sdk/android_sdk.wxs | 512 ++++++++++++++++++ platforms/Windows/shared/swift.en-us.wxl | 1 + 4 files changed, 543 insertions(+) create mode 100644 platforms/Windows/android_sdk/android_sdk.wixproj create mode 100644 platforms/Windows/android_sdk/android_sdk.wxs diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props index b6ec12ce..082cf1a5 100644 --- a/platforms/Windows/SideBySideUpgradeStrategy.props +++ b/platforms/Windows/SideBySideUpgradeStrategy.props @@ -25,6 +25,7 @@ {443F4D7F-38F3-47C8-9BEE-37FEB01D13C8} {762D10FE-EBE5-4554-BB78-FB13A4A487E3} {9749D9E6-E860-4FF6-9E8A-525270F471A3} + {485f88f4-9342-48cb-853a-12da885a5818} @@ -53,6 +54,7 @@ IdeUpgradeCode=$(IdeUpgradeCode); RtlUpgradeCode=$(RtlUpgradeCode); SdkUpgradeCode=$(SdkUpgradeCode); + AndroidSdkUpgradeCode=$(AndroidSdkUpgradeCode); diff --git a/platforms/Windows/android_sdk/android_sdk.wixproj b/platforms/Windows/android_sdk/android_sdk.wixproj new file mode 100644 index 00000000..01e6d250 --- /dev/null +++ b/platforms/Windows/android_sdk/android_sdk.wixproj @@ -0,0 +1,28 @@ + + + android_sdk.$(ProductArchitecture) + x86 + + $(SDK_ROOT)\usr\lib\swift\shims + + + $(DefineConstants); + SwiftShimsPath=$(SwiftShimsPath); + + + + + + + + + + SwiftShims + AndroidSDK_usr_lib_swift_shims + var.SwiftShimsPath + true + true + true + + + diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs new file mode 100644 index 00000000..a3c5074f --- /dev/null +++ b/platforms/Windows/android_sdk/android_sdk.wxs @@ -0,0 +1,512 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 15575e40..c8530a56 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -16,6 +16,7 @@ + From e242ac39e3a290b2afdeee0296e8989cd260d10e Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Wed, 22 May 2024 09:46:33 -0700 Subject: [PATCH 02/11] Add android SDK into the installer bundle --- platforms/Windows/bundle/installer.wixproj | 5 +++++ platforms/Windows/bundle/installer.wxs | 10 ++++++++++ platforms/Windows/bundle/theme.xml | 1 + platforms/Windows/shared/swift.en-us.wxl | 1 + 4 files changed, 17 insertions(+) diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index 1a920adc..95f1faa6 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -8,6 +8,7 @@ $(DefineConstants); INCLUDE_X86_SDK=$(INCLUDE_X86_SDK); INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK); + INCLUDE_ANDROID_SDKS=$(INCLUDE_ANDROID_SDKS); @@ -31,4 +32,8 @@ + + + + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 11de13d4..e0acc7f3 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -38,6 +38,7 @@ + - + diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index a11fabcb..06698a45 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -16,10 +16,10 @@ - - - - + + + + @@ -27,10 +27,6 @@ - - - - From 7f70a53363f3e18ee5c6942cb0dcad96d149aa11 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Wed, 5 Jun 2024 11:35:02 -0700 Subject: [PATCH 08/11] Install CxxStdlib for android SDK --- platforms/Windows/android_sdk/android_sdk.wxs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs index afd4f0c2..5745a091 100644 --- a/platforms/Windows/android_sdk/android_sdk.wxs +++ b/platforms/Windows/android_sdk/android_sdk.wxs @@ -89,7 +89,7 @@ - + @@ -331,6 +331,18 @@ + + + + + + + + + + + + @@ -503,7 +515,7 @@ - + From e861f2d6225a6a64f60af05ea8ee12a873796451 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Wed, 5 Jun 2024 11:38:04 -0700 Subject: [PATCH 09/11] Install the new _math module overlay --- platforms/Windows/android_sdk/android_sdk.wxs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs index 5745a091..22350235 100644 --- a/platforms/Windows/android_sdk/android_sdk.wxs +++ b/platforms/Windows/android_sdk/android_sdk.wxs @@ -95,6 +95,7 @@ + @@ -394,6 +395,21 @@ + + + + + + + + + + + + + + + @@ -520,6 +536,7 @@ + From 301bcc1dc751c258a546111a3e891d8470311ff4 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Thu, 6 Jun 2024 14:57:07 -0700 Subject: [PATCH 10/11] disable synchronization for armv7 android --- platforms/Windows/android_sdk/android_sdk.wxs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs index 22350235..b607d8e5 100644 --- a/platforms/Windows/android_sdk/android_sdk.wxs +++ b/platforms/Windows/android_sdk/android_sdk.wxs @@ -470,6 +470,8 @@ + + @@ -484,6 +486,7 @@ + @@ -541,7 +544,10 @@ + + + From c384797598a2f90a3d7738b088a3912a30022721 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Fri, 7 Jun 2024 15:11:28 -0700 Subject: [PATCH 11/11] rename android condition defines --- platforms/Windows/bundle/installer.wixproj | 16 ++++++++-------- platforms/Windows/bundle/installer.wxs | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index 9c1a0a75..358d17d5 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/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); @@ -36,19 +36,19 @@ - + - + - + - + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 5dc5eee1..3f313782 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -124,7 +124,7 @@ - + - + - + - +