Commit: 73ea52f9ed548f1a48317f0415366ee2fc55f180 - Fs-scripts (git)

Commit MetaInfo

• Revision: 73ea52f9ed548f1a48317f0415366ee2fc55f180 (tree)
• Time: 2022-09-11 10:25:20
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

update Android SDK for 5.15.6 and later

Change Summary

• modified: Compile/lib/Configuration.lua
• modified: Compile/lib/qtCompile/conf.lua

Incremental Difference

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -52,7 +52,7 @@ conf.host.win = {
 	["buildRootPath"] = "D:\\Qt\\", -- On Windows, the build root should be same with source package
 	["androidSdkPath"] = {
 		["29"] = "D:\\android-sdk-windows",
-		["Latest"] = "D:\\android-sdk-windows-2",
+		["Latest"] = "D:\\android-sdk-windows-20220911",
 	},
 	["androidNdkPath"] = {
 		["r21e"] = "D:\\android-ndk-r21e",
@@ -123,7 +123,7 @@ conf.host.linux = {
 	["pathSep"] = '/',
 	["androidSdkPath"] = {
 		["29"] = "/opt/env/android-sdk-linux/",
-		["Latest"] = "/opt/env/android-sdk-linux-2/",
+		["Latest"] = "/opt/env/android-sdk-linux-20220911/",
 	},
 	["androidNdkPath"] = {
 		["r21e"] = "/opt/env/android-ndk-r21e/",
@@ -157,7 +157,7 @@ conf.host.mac = {
 	["pathSep"] = '/',
 	["androidSdkPath"] = {
 		["29"] = "/opt/env/android-sdk-mac/",
-		["Latest"] = "/opt/env/android-sdk-mac-2/",
+		["Latest"] = "/opt/env/android-sdk-mac-20220911/",
 	},
 	["androidNdkPath"] = {
 		["r21e"] = "/opt/env/android-ndk-r21e/",
@@ -184,6 +184,7 @@ conf.host.macLegacy = {
 	["pathSep"] = '/',
 	["androidSdkPath"] = {
 		["29"] = "/Volumes/opt/env/android-sdk-mac-2/",
+		["Latest"] = "/Volumes/opt/env/android-sdk-mac-20220911/",
 	},
 	["androidNdkPath"] = {
 		["r21e"] = "/Volumes/opt/env/android-ndk-r21e/",

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -1997,7 +1997,7 @@ conf.Q5wx6m8_aalnl = {
 	target = "Android-21",
 	toolchainT = "Android-21-r21e-all",
 	opensslConf = "o1aalnl",
-	androidSdkVersion = "29",
+	androidSdkVersion = "Latest",
 	configureParameter = [[
 		-prefix
 		/
@@ -2049,7 +2049,7 @@ conf.Q5lx6_aalnl = {
 	target = "Android-21",
 	toolchainT = "Android-21-r21e-all",
 	opensslConf = "o1aalnl",
-	androidSdkVersion = "29",
+	androidSdkVersion = "Latest",
 	configureParameter = [[
 		-prefix
 		/
@@ -2101,7 +2101,7 @@ conf.Q5mx6_aalnl = {
 	target = "Android-21",
 	toolchainT = "Android-21-r21e-all",
 	opensslConf = "o1aalnl",
-	androidSdkVersion = "29",
+	androidSdkVersion = "Latest",
 	configureParameter = [[
 		-prefix
 		/