firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rolls engine to Android SDK 29 and its corresponding tools (flutter/engine#10692)

Browse Source 
* 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
This commit is contained in:
Shi-Hao Hong
2019-08-07 12:34:33 -04:00
committed by GitHub
parent f9e3a16668
commit c5a2f30915
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DEPS
View File

@@ -137,7 +137,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'c6bd1f1e25048a97d99cf2fa679bd54ebad94697',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '66afc8a17a9d10336a0d592822f3312266357bbd',
# Fuchsia compatibility
#
@@ -437,7 +437,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/build-tools/${{platform}}',
'version': 'version:28.0.3'
'version': 'version:29.0.1'
}
],
'condition': 'download_android_deps',
@@ -448,7 +448,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/platform-tools/${{platform}}',
'version': 'version:28.0.1'
'version': 'version:29.0.2'
}
],
'condition': 'download_android_deps',
@@ -459,7 +459,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/platforms',
'version': 'version:28r6'
'version': 'version:29r1'
}
],
'condition': 'download_android_deps',

2
engine/src/flutter/testing/run_tests.py
View File

@@ -222,7 +222,7 @@ def RunJavaTests(filter, android_build_variant):
robolectric_dir = os.path.join(buildroot_dir, 'third_party', 'robolectric', 'lib')
classpath = map(str, [
os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-28', 'android.jar'),
os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-29', 'android.jar'),
os.path.join(robolectric_dir, '*'), # Wildcard for all jars in the directory
os.path.join(android_out_dir, 'flutter_java.jar'),
os.path.join(android_out_dir, 'robolectric_tests.jar')

2
engine/src/flutter/tools/gen_javadoc.py
View File

@@ -31,7 +31,7 @@ def main():
'third_party/android_support/android_support_compat.jar',
'third_party/android_support/android_support_fragment.jar',
'third_party/android_support/android_support_v13.jar',
'third_party/android_tools/sdk/platforms/android-28/android.jar',
'third_party/android_tools/sdk/platforms/android-29/android.jar',
'base/android/java/src',
'third_party/jsr-305/src/ri/src/main/java',
]