DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify the create_cipd_packages.sh script to allow uploading multiple build-tools versions, and update to new bundle (#179963)

Browse Source 
1. modifies the script slightly to allow passing in multiple versions
for a given element
2. updates to build tools 36.1.0, and adds 35.0.0 and 34.0.0
3. also adds cmake to the list, version 3.22.1, as that downloaded in
our ci currently
4. changes ci yaml and deps file accordingly

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [ ] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

---------

Co-authored-by: Gray Mackall <mackall@google.com>
This commit is contained in:
Gray Mackall 2025-12-17 10:14:14 -08:00 committed by GitHub
parent abe119cf64
commit ef3dbceed2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 115 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
.ci.yaml
View File

@ -51,7 +51,7 @@ platform_properties:
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},
{"dependency": "open_jdk", "version": "version:21"},
@ -74,7 +74,7 @@ platform_properties:
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
{"dependency": "avd_cipd_version", "version": "build_id:8702262057250908257"},
{"dependency": "open_jdk", "version": "version:21"},
@ -98,7 +98,7 @@ platform_properties:
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "android_virtual_device", "version": "android_35_google_apis_x64.textpb"},
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"},
{"dependency": "open_jdk", "version": "version:21"},
@ -115,7 +115,7 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "curl", "version": "version:7.64.0"}
]
@ -127,7 +127,7 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "curl", "version": "version:7.64.0"}
]
@ -138,7 +138,7 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "curl", "version": "version:7.64.0"}
]
@ -149,7 +149,7 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "curl", "version": "version:7.64.0"}
]
@ -252,7 +252,7 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -264,7 +264,7 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
@ -342,7 +342,7 @@ platform_properties:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -375,7 +375,7 @@ targets:
test_timeout_secs: "3600" # 1 hour
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "curl", "version": "version:7.64.0"}
]
@ -411,7 +411,7 @@ targets:
# Requires Android SDK since we may re-generate Gradle lockfiles
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "gh_cli", "version": "version:2.8.0-2-g32256d38"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -432,7 +432,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -456,7 +456,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -475,7 +475,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -494,7 +494,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -513,7 +513,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -532,7 +532,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -692,7 +692,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -713,7 +713,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -801,7 +801,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -837,7 +837,7 @@ targets:
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "android_sdk", "version": "version:36v4unmodified"}
{"dependency": "android_sdk", "version": "version:36v6unmodified"}
]
shard: framework_tests
subshard: misc
@ -908,7 +908,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -931,7 +931,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -954,7 +954,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -977,7 +977,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1001,7 +1001,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1025,7 +1025,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1049,7 +1049,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1073,7 +1073,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1098,7 +1098,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1123,7 +1123,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1147,7 +1147,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1175,7 +1175,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1284,7 +1284,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -1348,7 +1348,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}
]
tags: >
@ -1377,7 +1377,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1405,7 +1405,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1433,7 +1433,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1461,7 +1461,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1489,7 +1489,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1517,7 +1517,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1545,7 +1545,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1604,7 +1604,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1631,7 +1631,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:11"}
]
@ -1655,7 +1655,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:17"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
@ -1682,7 +1682,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
@ -1707,7 +1707,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
shard: tool_tests
@ -1729,7 +1729,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
shard: tool_tests
@ -3715,7 +3715,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -3734,7 +3734,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -3753,7 +3753,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -3772,7 +3772,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -3792,7 +3792,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -3810,7 +3810,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -3828,7 +3828,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -3846,7 +3846,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -4036,7 +4036,7 @@ targets:
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "android_sdk", "version": "version:36v4unmodified"}
{"dependency": "android_sdk", "version": "version:36v6unmodified"}
]
shard: framework_tests
subshard: misc
@ -4067,7 +4067,7 @@ targets:
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "android_sdk", "version": "version:36v4unmodified"}
{"dependency": "android_sdk", "version": "version:36v6unmodified"}
]
shard: framework_tests
subshard: misc
@ -4123,7 +4123,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
tags: >
@ -4162,7 +4162,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
tags: >
@ -4182,7 +4182,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
tags: >
@ -4202,7 +4202,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
tags: >
@ -4223,7 +4223,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
tags: >
@ -4298,7 +4298,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
]
@ -4360,7 +4360,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
tags: >
@ -4380,7 +4380,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -4484,7 +4484,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -4511,7 +4511,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -4538,7 +4538,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -4565,7 +4565,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -4592,7 +4592,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
@ -4618,7 +4618,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
shard: tool_tests_commands
@ -4633,7 +4633,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
shard: tool_tests_commands
@ -4648,7 +4648,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
shard: tool_tests
@ -5665,7 +5665,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5683,7 +5683,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5701,7 +5701,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5719,7 +5719,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5737,7 +5737,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5755,7 +5755,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5773,7 +5773,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5791,7 +5791,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5809,7 +5809,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -5901,7 +5901,7 @@ targets:
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
{"dependency": "vs_build", "version": "version:vs2019"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "android_sdk", "version": "version:36v4unmodified"}
{"dependency": "android_sdk", "version": "version:36v6unmodified"}
]
shard: framework_tests
subshard: misc
@ -5989,7 +5989,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6035,7 +6035,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6056,7 +6056,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6077,7 +6077,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6100,7 +6100,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6148,7 +6148,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6169,7 +6169,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6190,7 +6190,7 @@ targets:
properties:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
@ -6332,7 +6332,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6358,7 +6358,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6384,7 +6384,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6410,7 +6410,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6436,7 +6436,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6462,7 +6462,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6488,7 +6488,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6514,7 +6514,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6540,7 +6540,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
@ -6567,7 +6567,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
@ -6614,7 +6614,7 @@ targets:
add_recipes_cq: "true"
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:36v4unmodified"},
{"dependency": "android_sdk", "version": "version:36v6unmodified"},
{"dependency": "open_jdk", "version": "version:21"}
]
shard: tool_tests

2
.github/actions/composite-flutter-setup/action.yml vendored
View File

@ -9,7 +9,7 @@ inputs:
default: 'android-36'
ANDROID_BUILDTOOLS:
description: 'android buildtools version'
default: '36.0.0'
default: '36.1.0'
runs:
using: 'composite'

2
DEPS
View File

@ -615,7 +615,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/all/${{platform}}',
'version': 'version:36v4unmodified'
'version': 'version:36v6unmodified'
}
],
'condition': 'download_android_deps',

2
engine/src/build/config/android/config.gni
View File

@ -8,7 +8,7 @@ if (is_android) {
if (!defined(default_android_sdk_root)) {
default_android_sdk_root = "//flutter/third_party/android_tools/sdk"
default_android_sdk_version = "36"
default_android_sdk_build_tools_version = "36.0.0"
default_android_sdk_build_tools_version = "36.1.0"
}
declare_args() {

2
engine/src/flutter/testing/android/native_activity/native_activity.gni
View File

@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
import("//flutter/tools/templater/templater.gni")
android_buildtools =
"//flutter/third_party/android_tools/sdk/build-tools/36.0.0"
"//flutter/third_party/android_tools/sdk/build-tools/36.1.0"
aapt2 = "$android_buildtools/aapt2"
zipalign = "$android_buildtools/zipalign"
apksigner = "$android_buildtools/apksigner"

7
engine/src/flutter/tools/android_sdk/create_cipd_packages.sh
View File

@ -111,8 +111,11 @@ for platform in "${platforms[@]}"; do
for package in $(cat $package_file_name); do
echo $package
split=(${package//:/ })
echo "Installing ${split[0]}"
yes "y" | $sdkmanager_path --sdk_root=$sdk_root ${split[0]}
IFS=',' read -ra ADDR <<< "${split[0]}"
for i in "${ADDR[@]}"; do
echo "Installing $i"
yes "y" | $sdkmanager_path --sdk_root=$sdk_root "$i"
done
# We copy only the relevant directories to a temporary dir
# for upload. sdkmanager creates extra files that we don't need.

3
engine/src/flutter/tools/android_sdk/packages.txt
View File

@ -1,6 +1,7 @@
platforms;android-36:platforms
cmdline-tools;latest:cmdline-tools
build-tools;36.0.0:build-tools
build-tools;36.1.0,build-tools;35.0.0,build-tools;34.0.0:build-tools
platform-tools:platform-tools
tools:tools
cmake;3.22.1:cmake
ndk;28.2.13676358:ndk