Fixup [skip actions]

microsoft · Nov 10, 2024 · c1181b6 · c1181b6
1 parent f8fb09e
commit c1181b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
@@ -485,11 +485,17 @@ if(EXISTS "${target_qt_conf}")
     endif()
 endif()
 
+if(VCPKG_TARGET_IS_ANDROID)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6Core/QtPlatformAndroid.cmake"
+        [[message(FATAL_ERROR "The Qt libraries on Android only supports the shared library configuration of stl. Please use -DANDROID_STL=\"c++_shared\" as configuration argument.")]]
+        [[message(WARNING "This vcpkg triplet uses ANDROID_STL=\"${ANDROID_STL}\". This configuration is not supported by Qt.")]]
+    )
+endif()
+
 if(VCPKG_TARGET_IS_EMSCRIPTEN)
   vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6Core/Qt6WasmMacros.cmake" "_qt_test_emscripten_version()" "") # this is missing a include(QtPublicWasmToolchainHelpers)
 endif()
 
-
 if(VCPKG_TARGET_IS_WINDOWS)
     set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16)
     set(DLLS_TO_COPY "")

diff --git a/scripts/azure-pipelines/acquire-android-sdk.ps1 b/scripts/azure-pipelines/acquire-android-sdk.ps1
@@ -1,12 +1,16 @@
-$JDKVersion = '17.0.2'
+$JDKVersion = '11.0.25+9'
 $ToolsVersion = '10406996_latest'
 
 Write-Host "Downloading the JDK"
-& "./vcpkg" x-download openjdk-$JDKVersion.tar.gz "--sha512=0bf168239a9a1738ad6368b8f931d072aeb122863ec39ea86dc0449837f06953ce18be87bab7e20fd2585299a680ea844ec419fa235da87dfdd7e37b73740a57" "--url=https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-${JDKVersion}_linux-x64_bin.tar.gz" @cachingArgs
+# OpenLogic provides OpenJDK builds under liberal terms 💚
+# https://www.openlogic.com/openjdk-downloads
+$JDKFile = "openlogic-openjdk-$JDKVersion-linux-x64.tar.gz"
+$JDKUrl = "https://builds.openlogic.com/downloadJDK/openlogic-openjdk/$JDKVersion/$JDKFile"
+& "./vcpkg" x-download $JDKFile "--sha512=e4991553adb987003f8fa61e7b6126bd6af2da5a379c7aa67473a1c5df2d9d9809518e29e9a1ce2ea7cf7d7376fb9b17e2a7ef935973a073429cb43b709a6d0c" "--url=$JDKUrl" @cachingArgs
 
+$env:JAVA_HOME = Join-Path $Pwd "openlogic-openjdk-$JDKVersion-linux-x64"
 Write-Host "Setting up the JDK in $env:JAVA_HOME"
-$env:JAVA_HOME = Join-Path $Pwd "jdk-$JDKVersion"
-& tar -xvf openjdk-$JDKVersion.tar.gz
+& tar -xvf $JDKFile
 
 Write-Host "Downloading the Android SDK"
 & "./vcpkg" x-download sdk-commandlinetools-linux-$ToolsVersion.zip "--sha512=64b7d18ee7adeb1204eaa2978091e874dc9af9604796b64e1a185a11c15325657383fc9900e55e4590c8b8a2784b3881745d2f32daef1207e746c0ee41c2b72b" "--url=https://dl.google.com/android/repository/commandlinetools-linux-${ToolsVersion}.zip"