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

Rolls engine to Android SDK 29 and its corresponding tools #10692

Merged
merged 3 commits into from
Aug 7, 2019
Merged

Rolls engine to Android SDK 29 and its corresponding tools #10692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfe167a
Rolls engine to Android SDK 29 and its corresponding tools
shihaohong Aug 7, 2019
446b01f
update from android-28 to android-29 in relevant files
shihaohong Aug 7, 2019
1801335
Roll buildroot to tip of tree
shihaohong Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -459,7 +459,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/platforms',
'version': 'version:28r6'
'version': 'version:29r1'
}
],
'condition': 'download_android_deps',
Expand Down
2 changes: 1 addition & 1 deletion testing/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tools/gen_javadoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down