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

Update to android 30r2 and roll buildroot #20479

Merged
GaryQian merged 7 commits into from
Aug 17, 2020
+6 −6
Merged

Update to android 30r2 and roll buildroot #20479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bc39a7
Update to android 30 and temp buildroot
GaryQian Aug 13, 2020
8fd488b
Change repo
GaryQian Aug 13, 2020
1c40937
Fix tests
GaryQian Aug 13, 2020
902f0d7
Roll buildroot
GaryQian Aug 13, 2020
f2e452d
update scenario_app to use Android 30
GaryQian Aug 13, 2020
7218cd5
Update buildroot hash
GaryQian Aug 16, 2020
de1ae1a
Remove extra space
GaryQian Aug 16, 2020
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 @@ -105,7 +105,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'b8d98f419b4c32eb1d575557d2c46e8c755ceac7',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a6c0959d1ac8cdfe6f9ff87892bc4905a73699fe',

# Fuchsia compatibility
#
Expand Down Expand Up @@ -425,7 +425,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/build-tools/${{platform}}',
'version': 'version:29.0.1'
'version': 'version:30.0.1'
}
],
'condition': 'download_android_deps',
Expand All @@ -436,7 +436,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/platform-tools/${{platform}}',
'version': 'version:29.0.2'
'version': 'version:30.0.4'
}
],
'condition': 'download_android_deps',
Expand All @@ -447,7 +447,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/platforms',
'version': 'version:29r1'
'version': 'version:30r2'
}
],
'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 @@ -345,7 +345,7 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'):

embedding_deps_dir = os.path.join(buildroot_dir, 'third_party', 'android_embedding_dependencies', 'lib')
classpath = map(str, [
os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-29', 'android.jar'),
os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-30', 'android.jar'),
Copy link
Member

@xster xster Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/flutter/engine/blob/master/testing/scenario_app/android/app/build.gradle#L10 for tests too

os.path.join(embedding_deps_dir, '*'), # Wildcard for all jars in the directory
os.path.join(android_out_dir, 'flutter.jar'),
os.path.join(android_out_dir, 'robolectric_tests.jar')
Expand Down
2 changes: 1 addition & 1 deletion testing/scenario_app/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ screenshots {
}

android {
compileSdkVersion 28
compileSdkVersion 30
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down