Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 797f032

Browse files
author
Shi-Hao Hong
authored
Rolls engine to Android SDK 29 and its corresponding tools (#10692)
* Rolls engine to Android SDK 29 and its corresponding tools * Update from android-28 to android-29 in relevant files * Roll buildroot to tip of tree
1 parent f2f84ca commit 797f032

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

DEPS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ allowed_hosts = [
137137
]
138138

139139
deps = {
140-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'c6bd1f1e25048a97d99cf2fa679bd54ebad94697',
140+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '66afc8a17a9d10336a0d592822f3312266357bbd',
141141

142142
# Fuchsia compatibility
143143
#
@@ -437,7 +437,7 @@ deps = {
437437
'packages': [
438438
{
439439
'package': 'flutter/android/sdk/build-tools/${{platform}}',
440-
'version': 'version:28.0.3'
440+
'version': 'version:29.0.1'
441441
}
442442
],
443443
'condition': 'download_android_deps',
@@ -448,7 +448,7 @@ deps = {
448448
'packages': [
449449
{
450450
'package': 'flutter/android/sdk/platform-tools/${{platform}}',
451-
'version': 'version:28.0.1'
451+
'version': 'version:29.0.2'
452452
}
453453
],
454454
'condition': 'download_android_deps',
@@ -459,7 +459,7 @@ deps = {
459459
'packages': [
460460
{
461461
'package': 'flutter/android/sdk/platforms',
462-
'version': 'version:28r6'
462+
'version': 'version:29r1'
463463
}
464464
],
465465
'condition': 'download_android_deps',

testing/run_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def RunJavaTests(filter, android_build_variant):
222222

223223
robolectric_dir = os.path.join(buildroot_dir, 'third_party', 'robolectric', 'lib')
224224
classpath = map(str, [
225-
os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-28', 'android.jar'),
225+
os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-29', 'android.jar'),
226226
os.path.join(robolectric_dir, '*'), # Wildcard for all jars in the directory
227227
os.path.join(android_out_dir, 'flutter_java.jar'),
228228
os.path.join(android_out_dir, 'robolectric_tests.jar')

tools/gen_javadoc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def main():
3131
'third_party/android_support/android_support_compat.jar',
3232
'third_party/android_support/android_support_fragment.jar',
3333
'third_party/android_support/android_support_v13.jar',
34-
'third_party/android_tools/sdk/platforms/android-28/android.jar',
34+
'third_party/android_tools/sdk/platforms/android-29/android.jar',
3535
'base/android/java/src',
3636
'third_party/jsr-305/src/ri/src/main/java',
3737
]

0 commit comments

Comments
 (0)