From bfe167a3826dd819bf8efa8ff7be26a64daf18a9 Mon Sep 17 00:00:00 2001 From: Shi Hao Hong Date: Wed, 7 Aug 2019 07:48:19 -0700 Subject: [PATCH 1/3] Rolls engine to Android SDK 29 and its corresponding tools --- DEPS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index b4476650d3c3f..e69e401763b2c 100644 --- a/DEPS +++ b/DEPS @@ -137,7 +137,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'c6bd1f1e25048a97d99cf2fa679bd54ebad94697', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '07d0e2668a491a67197d569d4e6a724d3191bdd1', # 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', From 446b01f691606bc411443337f75bde573e02e33c Mon Sep 17 00:00:00 2001 From: Shi Hao Hong Date: Wed, 7 Aug 2019 08:55:02 -0700 Subject: [PATCH 2/3] update from android-28 to android-29 in relevant files --- testing/run_tests.py | 2 +- tools/gen_javadoc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index affc39e487f43..e3d5628cea08b 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -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') diff --git a/tools/gen_javadoc.py b/tools/gen_javadoc.py index 28ccbeb1b8e01..fb9f0ae34c753 100755 --- a/tools/gen_javadoc.py +++ b/tools/gen_javadoc.py @@ -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', ] From 180133529e5f156246633dd6d579ed9b9b06fd20 Mon Sep 17 00:00:00 2001 From: Shi Hao Hong Date: Wed, 7 Aug 2019 09:11:03 -0700 Subject: [PATCH 3/3] Roll buildroot to tip of tree --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index e69e401763b2c..1a2aba243360b 100644 --- a/DEPS +++ b/DEPS @@ -137,7 +137,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '07d0e2668a491a67197d569d4e6a724d3191bdd1', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '66afc8a17a9d10336a0d592822f3312266357bbd', # Fuchsia compatibility #