mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Update to android 30r2 and roll buildroot (#20479)
This commit is contained in:
parent
615679865a
commit
02de4eb7ce
8
DEPS
8
DEPS
@ -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
|
||||
#
|
||||
@ -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',
|
||||
@ -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',
|
||||
@ -447,7 +447,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'flutter/android/sdk/platforms',
|
||||
'version': 'version:29r1'
|
||||
'version': 'version:30r2'
|
||||
}
|
||||
],
|
||||
'condition': 'download_android_deps',
|
||||
|
||||
@ -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'),
|
||||
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')
|
||||
|
||||
@ -7,7 +7,7 @@ screenshots {
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 28
|
||||
compileSdkVersion 30
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user