[Ubuntu, Windows] Add new android NDK and CMake (#11628)

Alexey-Ayupov · web-flow · commit d7dfc73ec2a6 · 2025-02-20T16:13:38.000+01:00
diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json
@@ -88,9 +88,9 @@
         "addon_list": [
         ],
         "additional_tools": [
-            "cmake;3.10.2.4988404",
             "cmake;3.18.1",
-            "cmake;3.22.1"
+            "cmake;3.22.1",
+            "cmake;3.31.5"
         ],
         "ndk": {
             "default": "27",
diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json
@@ -85,9 +85,9 @@
         "addon_list": [
         ],
         "additional_tools": [
-            "cmake;3.10.2.4988404",
             "cmake;3.18.1",
-            "cmake;3.22.1"
+            "cmake;3.22.1",
+            "cmake;3.31.5"
         ],
         "ndk": {
             "default": "27",
diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json
@@ -81,11 +81,12 @@
         "addon_list": [
         ],
         "additional_tools": [
+            "cmake;3.31.5"
         ],
         "ndk": {
             "default": "27",
             "versions": [
-                "26", "27"
+                "26", "27", "28"
             ]
         }
     },
diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
@@ -143,14 +143,14 @@
             "addon-google_apis-google-21"
         ],
         "additional_tools": [
-            "cmake;3.10.2.4988404",
             "cmake;3.18.1",
-            "cmake;3.22.1"
+            "cmake;3.22.1",
+            "cmake;3.31.5"
         ],
         "ndk": {
             "default": "27",
             "versions": [
-                "26" , "27"
+                "26" , "27", "28"
             ]
         }
     },
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
@@ -139,12 +139,13 @@
         "addons": [],
         "additional_tools": [
             "cmake;3.18.1",
-            "cmake;3.22.1"
+            "cmake;3.22.1",
+            "cmake;3.31.5"
         ],
         "ndk": {
             "default": "27",
             "versions": [
-                "26", "27"
+                "26", "27", "28"
             ]
         }
     },
diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json
@@ -96,12 +96,13 @@
         "addons": [],
         "additional_tools": [
             "cmake;3.22.1",
-            "cmake;3.30.5"
+            "cmake;3.30.5",
+            "cmake;3.31.5"
         ],
         "ndk": {
             "default": "27",
             "versions": [
-                "26", "27"
+                "26", "27", "28"
             ]
         }
     },

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,12 @@`
`81`	`81`	`"addon_list": [`
`82`	`82`	`],`
`83`	`83`	`"additional_tools": [`
	`84`	`+ "cmake;3.31.5"`
`84`	`85`	`],`
`85`	`86`	`"ndk": {`
`86`	`87`	`"default": "27",`
`87`	`88`	`"versions": [`
`88`		`- "26", "27"`
	`89`	`+ "26", "27", "28"`
`89`	`90`	`]`
`90`	`91`	`}`
`91`	`92`	`},`