From 03266f1ace3aa498b1b81e41c94c6494616bb99e Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 25 Jun 2024 15:44:10 -0700 Subject: [PATCH 01/26] Make base engine changes --- DEPS | 3 ++- shell/platform/android/build.gradle | 2 +- shell/platform/android/test_runner/build.gradle | 2 +- testing/scenario_app/android/app/build.gradle | 2 +- tools/android_sdk/packages.txt | 6 +++--- tools/cipd/android_embedding_bundle/build.gradle | 2 +- tools/javadoc/gen_javadoc.py | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index 343a801393207..ce04a8470d77d 100644 --- a/DEPS +++ b/DEPS @@ -277,6 +277,7 @@ allowed_hosts = [ ] deps = { + # TODO(camsim99): Update to latest buildroot commit when https://github.com/flutter/buildroot/pull/870 lands. 'src': 'https://github.com/flutter/buildroot.git' + '@' + '9a4ba8138aed94000ac5070590a21030008903bb', 'src/flutter/third_party/depot_tools': @@ -774,7 +775,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:34v7' + 'version': 'version:35v1' } ], 'condition': 'download_android_deps', diff --git a/shell/platform/android/build.gradle b/shell/platform/android/build.gradle index 5d8bded77f378..7000649c7a228 100644 --- a/shell/platform/android/build.gradle +++ b/shell/platform/android/build.gradle @@ -20,7 +20,7 @@ repositories { apply plugin: "com.android.library" android { - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { minSdkVersion 21 diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index ae17e48ddeebd..9f8b14b9d1654 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -33,7 +33,7 @@ println "==========================================" android { namespace 'io.flutter.app.test' - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { minSdkVersion 21 diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index 51eea659614d9..e8ca83255e4ee 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -19,7 +19,7 @@ android { disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } buildToolsVersion = '34.0.0' - compileSdkVersion 34 + compileSdkVersion 35 compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index 43a2526314c4e..b62e52c76e41b 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -1,6 +1,6 @@ -platforms;android-34:platforms +platforms;android-35:platforms cmdline-tools;latest:cmdline-tools -build-tools;34.0.0:build-tools +build-tools;35.0.0-rc4:build-tools platform-tools:platform-tools tools:tools -ndk;22.1.7171670:ndk +ndk;25.2.9519653:ndk diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle index c10b3c9ec33b0..db7af5c934572 100644 --- a/tools/cipd/android_embedding_bundle/build.gradle +++ b/tools/cipd/android_embedding_bundle/build.gradle @@ -33,7 +33,7 @@ allprojects { apply plugin: "com.android.application" android { - compileSdkVersion 34 + compileSdkVersion 35 } configurations { diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index cd30594215a28..368f9ef8e2427 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -50,7 +50,7 @@ def main(): os.makedirs(args.out_dir) android_jar_path = os.path.join( - args.src_dir, 'flutter', 'third_party', 'android_tools', 'sdk', 'platforms', 'android-34', + args.src_dir, 'flutter', 'third_party', 'android_tools', 'sdk', 'platforms', 'android-35', 'android.jar' ) if not os.path.exists(android_jar_path): From 7ca603da6919386952ac0ef8cd87aa07b61f5154 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Fri, 28 Jun 2024 09:47:37 -0700 Subject: [PATCH 02/26] Correct 35 version --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 542d9581c08de..a4c406953336e 100644 --- a/DEPS +++ b/DEPS @@ -775,7 +775,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:35v1' + 'version': 'version:35betav2' } ], 'condition': 'download_android_deps', From 8c0e53879c3491d808e9108b104e4deadda4a9ad Mon Sep 17 00:00:00 2001 From: camsim99 Date: Fri, 28 Jun 2024 09:49:17 -0700 Subject: [PATCH 03/26] compileSdk --- shell/platform/android/build.gradle | 2 +- shell/platform/android/test_runner/build.gradle | 2 +- testing/scenario_app/android/app/build.gradle | 2 +- tools/cipd/android_embedding_bundle/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/platform/android/build.gradle b/shell/platform/android/build.gradle index 7000649c7a228..52874cb515ac8 100644 --- a/shell/platform/android/build.gradle +++ b/shell/platform/android/build.gradle @@ -20,7 +20,7 @@ repositories { apply plugin: "com.android.library" android { - compileSdkVersion 35 + compileSdk 35 defaultConfig { minSdkVersion 21 diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 9f8b14b9d1654..7c6d87884bac1 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -33,7 +33,7 @@ println "==========================================" android { namespace 'io.flutter.app.test' - compileSdkVersion 35 + compileSdk 35 defaultConfig { minSdkVersion 21 diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index dca4892da1c36..b171f0db96c67 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -20,7 +20,7 @@ android { disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } buildToolsVersion = '34.0.0' - compileSdkVersion 35 + compileSdk 35 compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle index 897683c643c79..f6811553ae054 100644 --- a/tools/cipd/android_embedding_bundle/build.gradle +++ b/tools/cipd/android_embedding_bundle/build.gradle @@ -33,7 +33,7 @@ allprojects { apply plugin: "com.android.application" android { - compileSdkVersion 35 + compileSdk 35 } configurations { From 291cb415b12d95225904b1bd8ba24c00b1c5603b Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 1 Jul 2024 09:15:49 -0700 Subject: [PATCH 04/26] Undo packages + change for test --- tools/android_sdk/packages.txt | 6 +++--- tools/javadoc/gen_javadoc.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index b62e52c76e41b..43a2526314c4e 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -1,6 +1,6 @@ -platforms;android-35:platforms +platforms;android-34:platforms cmdline-tools;latest:cmdline-tools -build-tools;35.0.0-rc4:build-tools +build-tools;34.0.0:build-tools platform-tools:platform-tools tools:tools -ndk;25.2.9519653:ndk +ndk;22.1.7171670:ndk diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index 368f9ef8e2427..db49d336f2cf0 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -50,7 +50,7 @@ def main(): os.makedirs(args.out_dir) android_jar_path = os.path.join( - args.src_dir, 'flutter', 'third_party', 'android_tools', 'sdk', 'platforms', 'android-35', + args.src_dir, 'flutter', 'third_party', 'android_tools', 'sdk', 'platforms', 'android-34', # todo: change to 35 'android.jar' ) if not os.path.exists(android_jar_path): From 65d90a95599eb02eb912b961f1175a378f3720be Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 1 Jul 2024 09:17:47 -0700 Subject: [PATCH 05/26] format --- tools/javadoc/gen_javadoc.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index db49d336f2cf0..15cbfe9c7cdab 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -50,7 +50,13 @@ def main(): os.makedirs(args.out_dir) android_jar_path = os.path.join( - args.src_dir, 'flutter', 'third_party', 'android_tools', 'sdk', 'platforms', 'android-34', # todo: change to 35 + args.src_dir, + 'flutter', + 'third_party', + 'android_tools', + 'sdk', + 'platforms', + 'android-34', # todo: change to 35 'android.jar' ) if not os.path.exists(android_jar_path): From e317ce4940aa2fa54642a65fd5ec2e0b15881a76 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 1 Jul 2024 11:37:09 -0700 Subject: [PATCH 06/26] Change back to 35 --- tools/javadoc/gen_javadoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index 15cbfe9c7cdab..2754ebbd894d0 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -56,7 +56,7 @@ def main(): 'android_tools', 'sdk', 'platforms', - 'android-34', # todo: change to 35 + 'android-35', 'android.jar' ) if not os.path.exists(android_jar_path): From 5ce0a8da16795758a008851b3bad790373232588 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 1 Jul 2024 11:37:47 -0700 Subject: [PATCH 07/26] format --- tools/javadoc/gen_javadoc.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index 2754ebbd894d0..368f9ef8e2427 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -50,13 +50,7 @@ def main(): os.makedirs(args.out_dir) android_jar_path = os.path.join( - args.src_dir, - 'flutter', - 'third_party', - 'android_tools', - 'sdk', - 'platforms', - 'android-35', + args.src_dir, 'flutter', 'third_party', 'android_tools', 'sdk', 'platforms', 'android-35', 'android.jar' ) if not os.path.exists(android_jar_path): From 9b01ee77e654c1842cd4cf7b595cd810542ea72a Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 1 Jul 2024 13:30:22 -0700 Subject: [PATCH 08/26] Test with buildroot changes --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index a4c406953336e..1da3aaf97534a 100644 --- a/DEPS +++ b/DEPS @@ -278,7 +278,7 @@ allowed_hosts = [ deps = { # TODO(camsim99): Update to latest buildroot commit when https://github.com/flutter/buildroot/pull/870 lands. - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '8c2d66fa4e6298894425f5bdd0591bc5b1154c53', + 'src': 'https://github.com/camsim99/buildroot.git' + '@' + 'af95350cf3be382145006d89102866827a9f55d1', 'src/flutter/third_party/depot_tools': Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7', From 3e099959c542f829b3745458f8b94cc9a6686177 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jul 2024 08:59:00 -0700 Subject: [PATCH 09/26] Update 35 version to 35v1 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 1da3aaf97534a..f69febef1f1fe 100644 --- a/DEPS +++ b/DEPS @@ -775,7 +775,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:35betav2' + 'version': 'version:35v1' } ], 'condition': 'download_android_deps', From 7ff2d27644a77925cf1f32501618ef1cbf8b9b00 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jul 2024 09:29:33 -0700 Subject: [PATCH 10/26] Update impeller test --- testing/android/native_activity/native_activity.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/android/native_activity/native_activity.gni b/testing/android/native_activity/native_activity.gni index d5af82452a2d6..92c23b983f7fb 100644 --- a/testing/android/native_activity/native_activity.gni +++ b/testing/android/native_activity/native_activity.gni @@ -6,12 +6,12 @@ import("//build/config/android/config.gni") import("//flutter/tools/templater/templater.gni") android_buildtools = - "//flutter/third_party/android_tools/sdk/build-tools/34.0.0" + "//flutter/third_party/android_tools/sdk/build-tools/35.0.0" aapt2 = "$android_buildtools/aapt2" zipalign = "$android_buildtools/zipalign" apksigner = "$android_buildtools/apksigner" android_jar = - "//flutter/third_party/android_tools/sdk/platforms/android-34/android.jar" + "//flutter/third_party/android_tools/sdk/platforms/android-35/android.jar" src_root = "//flutter/testing/android/native_activity" # A drop in replacement for an executable or shared library target. Providing a From b5305001fffa58550997d13ef04a9e66cf12dff3 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jul 2024 12:39:11 -0700 Subject: [PATCH 11/26] Correct Imepller version --- testing/android/native_activity/native_activity.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/android/native_activity/native_activity.gni b/testing/android/native_activity/native_activity.gni index 92c23b983f7fb..89692a307fcac 100644 --- a/testing/android/native_activity/native_activity.gni +++ b/testing/android/native_activity/native_activity.gni @@ -6,7 +6,7 @@ import("//build/config/android/config.gni") import("//flutter/tools/templater/templater.gni") android_buildtools = - "//flutter/third_party/android_tools/sdk/build-tools/35.0.0" + "//flutter/third_party/android_tools/sdk/build-tools/35.0.0-rc4" aapt2 = "$android_buildtools/aapt2" zipalign = "$android_buildtools/zipalign" apksigner = "$android_buildtools/apksigner" From 35265f8ba1df3cd87ac460307fda25b48fe74ec8 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jul 2024 13:36:34 -0700 Subject: [PATCH 12/26] Test correct root --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index f69febef1f1fe..c12f8e4400dea 100644 --- a/DEPS +++ b/DEPS @@ -278,7 +278,7 @@ allowed_hosts = [ deps = { # TODO(camsim99): Update to latest buildroot commit when https://github.com/flutter/buildroot/pull/870 lands. - 'src': 'https://github.com/camsim99/buildroot.git' + '@' + 'af95350cf3be382145006d89102866827a9f55d1', + 'src': 'https://github.com/camsim99/buildroot.git' + '@' + '4df72a1c2fa5134ece3cd1681bb1b928b38db2e8', 'src/flutter/third_party/depot_tools': Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7', From 380766e08de0a2a924952736cd7265477efec8d2 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jul 2024 13:50:29 -0700 Subject: [PATCH 13/26] Another impeller update --- testing/scenario_app/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index b171f0db96c67..62aa67e9d5339 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -19,7 +19,7 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } - buildToolsVersion = '34.0.0' + buildToolsVersion = '35.0.0' compileSdk 35 compileOptions { sourceCompatibility JavaVersion.VERSION_11 From a9b171c7784c80bc691e89499ba60b7e23391778 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jul 2024 13:54:44 -0700 Subject: [PATCH 14/26] Correct build tools version --- testing/scenario_app/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index 62aa67e9d5339..44e1340093b8b 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -19,7 +19,7 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } - buildToolsVersion = '35.0.0' + buildToolsVersion = '35.0.0-rc4' compileSdk 35 compileOptions { sourceCompatibility JavaVersion.VERSION_11 From d5963e2ba49857147da13bdb610e51cb805be0bc Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jul 2024 14:54:03 -0700 Subject: [PATCH 15/26] Bump target version --- testing/scenario_app/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index 44e1340093b8b..57ed70ea8488e 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -28,7 +28,7 @@ android { defaultConfig { applicationId 'dev.flutter.scenarios' minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' testInstrumentationRunner 'dev.flutter.TestRunner' From ea34633e6ba2d21db463c768062fb999eb00e54c Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 11 Jul 2024 09:49:29 -0700 Subject: [PATCH 16/26] Bump test runner AGP version --- shell/platform/android/test_runner/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 7c6d87884bac1..5772e081eafa6 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.0.1" + classpath "com.android.tools.build:gradle:8.3.0" } } From 380d49d205dc4986f0b61f4fa99e76d8d5eff2d2 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 15 Jul 2024 13:01:23 -0500 Subject: [PATCH 17/26] bump manifest target --- shell/platform/android/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/AndroidManifest.xml b/shell/platform/android/AndroidManifest.xml index aca92f0ec7887..cbc2aa2e8cde7 100644 --- a/shell/platform/android/AndroidManifest.xml +++ b/shell/platform/android/AndroidManifest.xml @@ -5,7 +5,7 @@ --> - + From 59616818ba93d5b76aba5f9af58b2514e3b06c01 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 16 Jul 2024 16:02:42 -0700 Subject: [PATCH 18/26] deps --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index c12f8e4400dea..c980427c3b8db 100644 --- a/DEPS +++ b/DEPS @@ -735,7 +735,7 @@ deps = { { # See tools/gradle/README.md for update instructions. # Version here means the CIPD tag. - 'version': 'version:8.3', + 'version': 'version:8.9', 'package': 'flutter/gradle' } ], From 32339a92e5c36bb54f744ae08d8442fcc3f828a5 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 17 Jul 2024 12:14:34 -0700 Subject: [PATCH 19/26] Suppress deprecations --- .../embedding/engine/systemchannels/PlatformViewsChannel.java | 2 +- .../android/FlutterActivityAndFragmentDelegateTest.java | 3 +++ .../embedding/engine/renderer/FlutterRendererTest.java | 2 ++ .../test/io/flutter/plugin/platform/PlatformPluginTest.java | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java index 109721300cfe4..d3108e041a7be 100644 --- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java +++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java @@ -290,7 +290,7 @@ public interface PlatformViewsHandler { * The ID returned by {@code createForTextureLayer} to indicate that the requested texture mode * was not available and the view creation fell back to {@code PlatformViewLayer} mode. * - * This can only be returned if the {@link PlatformViewCreationRequest} sets + * This can only be returned if the {@code PlatformViewCreationRequest} sets * {@code TEXTURE_WITH_HYBRID_FALLBACK} as the requested display mode. */ static final long NON_TEXTURE_FALLBACK = -2; diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java index 7262eaf0c37a3..89a9573ae72d1 100644 --- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java +++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java @@ -1048,6 +1048,9 @@ public void itForwardsOnUserLeaveHintToFlutterEngine() { } @Test + @SuppressWarnings("deprecation") + // TRIM_MEMORY_COMPLETE, TRIM_MEMORY_MODERATE, TRIM_MEMORY_RUNNING_LOW, + // TRIM_MEMORY_RUNNING_MODERATE, TRIM_MEMORY_RUNNING_CRITICAL public void itNotifiesDartExecutorAndSendsMessageOverSystemChannelWhenToldToTrimMemory() { // Create the real object that we're testing. FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); diff --git a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java index 1779d6fc56077..76a14828bdd95 100644 --- a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java +++ b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java @@ -381,6 +381,8 @@ public void itRemovesListenerWhenSurfaceTextureEntryReleased() { } @Test + @SuppressWarnings("deprecation") + // TRIM_MEMORY_COMPLETE public void itNotifySurfaceTextureEntryWhenMemoryPressureWarning() { // Setup the test. FlutterRenderer flutterRenderer = engineRule.getFlutterEngine().getRenderer(); diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java index 36b497bc55f80..610800d9724b6 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java @@ -190,6 +190,7 @@ public void platformPlugin_getClipboardDataIsNullWhenNonContentUriProvided() thr } @Test + @SuppressWarnings("deprecation") public void platformPlugin_getClipboardDataIsNullWhenItemHasNoTextNorUri() throws IOException { View fakeDecorView = mock(View.class); Window fakeWindow = mock(Window.class); @@ -263,6 +264,9 @@ public void platformPlugin_hasStrings() { } @Config(sdk = API_LEVELS.API_29) + @SuppressWarnings("deprecation") + // setStatusBarColor, setNavigationBarColor, setNavigationBarDividerColor, + // setStatusBarContrastEnforced, setNavigationBarContrastEnforced @Test public void setNavigationBarDividerColor() { View fakeDecorView = mock(View.class); From 1f07cd89fda61b058a983998808c711f3fa1b32e Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 18 Jul 2024 12:45:32 -0700 Subject: [PATCH 20/26] Undo added code --- .../test/io/flutter/plugin/platform/PlatformPluginTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java index 610800d9724b6..9b48dbcae1a73 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java @@ -190,7 +190,6 @@ public void platformPlugin_getClipboardDataIsNullWhenNonContentUriProvided() thr } @Test - @SuppressWarnings("deprecation") public void platformPlugin_getClipboardDataIsNullWhenItemHasNoTextNorUri() throws IOException { View fakeDecorView = mock(View.class); Window fakeWindow = mock(Window.class); From d3b8f43894fb8e239a904fe4c1f86706a1adf306 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Fri, 19 Jul 2024 09:40:55 -0700 Subject: [PATCH 21/26] Update AGP, update packages.txt, remove unneeded test case --- ci/test/ban_generated_plugin_registrant_java_test.sh | 5 ----- shell/platform/android/test_runner/build.gradle | 2 +- tools/android_sdk/packages.txt | 6 +++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ci/test/ban_generated_plugin_registrant_java_test.sh b/ci/test/ban_generated_plugin_registrant_java_test.sh index 3f6d4e415a85e..ae8768f86f9c0 100755 --- a/ci/test/ban_generated_plugin_registrant_java_test.sh +++ b/ci/test/ban_generated_plugin_registrant_java_test.sh @@ -44,7 +44,6 @@ touch "$FLUTTER_DIR/GeneratedPluginRegistrant.java" # Create a trap that, on exit, removes the temp files. function cleanup() { - rm -f "$SRC_DIR/third_party/GeneratedPluginRegistrant.java" rm -f "$FLUTTER_DIR/GeneratedPluginRegistrant.java" rm -f "$FLUTTER_DIR/third_party/GeneratedPluginRegistrant.java" } @@ -58,10 +57,6 @@ trap cleanup EXIT } echo "PASS: ban_generated_plugin_registrant_java failed as expected" -# Create a file in SRC_DIR/third_party, that should be OK. -echo "Creating file ./src/third_party/GeneratedPluginRegistrant.java" -touch "$SRC_DIR/third_party/GeneratedPluginRegistrant.java" - # Run the ban script, expecting it to succeed. "$FLUTTER_DIR/ci/ban_generated_plugin_registrant_java.sh" > /dev/null 2>&1 || { echo "PASS: ban_generated_plugin_registrant_java ignored third_party" diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 5772e081eafa6..458cc13d6b5fe 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.3.0" + classpath "com.android.tools.build:gradle:8.5.0" } } diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index 4226aba007cfc..c4f49cd6bc80b 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -1,6 +1,6 @@ -platforms;android-34:platforms +platforms;android-35:platforms cmdline-tools;latest:cmdline-tools -build-tools;34.0.0:build-tools +build-tools;35.0.0-rc4:build-tools platform-tools:platform-tools tools:tools -ndk;26.1.10909125:ndk +ndk;26.3.11579264:ndk From 77bf104364d00e8bbad2b18a7dc0ab8c890c8640 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Fri, 19 Jul 2024 12:18:07 -0700 Subject: [PATCH 22/26] what is src dir --- ci/test/ban_generated_plugin_registrant_java_test.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/test/ban_generated_plugin_registrant_java_test.sh b/ci/test/ban_generated_plugin_registrant_java_test.sh index ae8768f86f9c0..939fa2864d2f5 100755 --- a/ci/test/ban_generated_plugin_registrant_java_test.sh +++ b/ci/test/ban_generated_plugin_registrant_java_test.sh @@ -44,6 +44,7 @@ touch "$FLUTTER_DIR/GeneratedPluginRegistrant.java" # Create a trap that, on exit, removes the temp files. function cleanup() { + rm -f "$SRC_DIR/third_party/GeneratedPluginRegistrant.java" rm -f "$FLUTTER_DIR/GeneratedPluginRegistrant.java" rm -f "$FLUTTER_DIR/third_party/GeneratedPluginRegistrant.java" } @@ -57,6 +58,11 @@ trap cleanup EXIT } echo "PASS: ban_generated_plugin_registrant_java failed as expected" +# Create a file in SRC_DIR/third_party, that should be OK. +echo "Creating file ./src/third_party/GeneratedPluginRegistrant.java" +echo "$SRC_DIR" +touch "$SRC_DIR/third_party/GeneratedPluginRegistrant.java" + # Run the ban script, expecting it to succeed. "$FLUTTER_DIR/ci/ban_generated_plugin_registrant_java.sh" > /dev/null 2>&1 || { echo "PASS: ban_generated_plugin_registrant_java ignored third_party" From 53ee46d67399ecff0ea5f7abef15530ccf3ebbcc Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 22 Jul 2024 10:13:26 -0700 Subject: [PATCH 23/26] Correct directory --- ci/test/ban_generated_plugin_registrant_java_test.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/test/ban_generated_plugin_registrant_java_test.sh b/ci/test/ban_generated_plugin_registrant_java_test.sh index 939fa2864d2f5..dfb19496805f1 100755 --- a/ci/test/ban_generated_plugin_registrant_java_test.sh +++ b/ci/test/ban_generated_plugin_registrant_java_test.sh @@ -59,9 +59,8 @@ trap cleanup EXIT echo "PASS: ban_generated_plugin_registrant_java failed as expected" # Create a file in SRC_DIR/third_party, that should be OK. -echo "Creating file ./src/third_party/GeneratedPluginRegistrant.java" -echo "$SRC_DIR" -touch "$SRC_DIR/third_party/GeneratedPluginRegistrant.java" +echo "Creating file ./src/flutter/third_party/GeneratedPluginRegistrant.java" +touch "$SRC_DIR/flutter/third_party/GeneratedPluginRegistrant.java" # Run the ban script, expecting it to succeed. "$FLUTTER_DIR/ci/ban_generated_plugin_registrant_java.sh" > /dev/null 2>&1 || { From 7fecb2a089c0d29c0e6daec5a14f618d28255651 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 23 Jul 2024 10:34:26 -0700 Subject: [PATCH 24/26] Update buildroot commit --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index bd0a42a45f631..da68483beb5c4 100644 --- a/DEPS +++ b/DEPS @@ -278,7 +278,7 @@ allowed_hosts = [ deps = { # TODO(camsim99): Update to latest buildroot commit when https://github.com/flutter/buildroot/pull/870 lands. - 'src': 'https://github.com/camsim99/buildroot.git' + '@' + '4df72a1c2fa5134ece3cd1681bb1b928b38db2e8', + 'src': 'https://github.com/camsim99/buildroot.git' + '@' + '9706e6bf6b5c2aecf125aae486dc9f3127d21ca5', 'src/flutter/third_party/depot_tools': Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7', From 7adc7b8d23f3703998a396ac484ed7710d1beb26 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 23 Jul 2024 14:33:33 -0700 Subject: [PATCH 25/26] Temporarily undo deps change --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 17bc128b93c02..bdd8d35ddbf31 100644 --- a/DEPS +++ b/DEPS @@ -278,7 +278,7 @@ allowed_hosts = [ deps = { # TODO(camsim99): Update to latest buildroot commit when https://github.com/flutter/buildroot/pull/870 lands. - 'src': 'https://github.com/camsim99/buildroot.git' + '@' + '9706e6bf6b5c2aecf125aae486dc9f3127d21ca5', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '327906297b49980748ea1956019829e7c434a03e', 'src/flutter/third_party/depot_tools': Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7', From 1635d85885a431c0e20240604619888e25ddb497 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 23 Jul 2024 14:45:01 -0700 Subject: [PATCH 26/26] Update DEPS entry --- DEPS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DEPS b/DEPS index bdd8d35ddbf31..13a9980c9aa64 100644 --- a/DEPS +++ b/DEPS @@ -277,8 +277,7 @@ allowed_hosts = [ ] deps = { - # TODO(camsim99): Update to latest buildroot commit when https://github.com/flutter/buildroot/pull/870 lands. - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '327906297b49980748ea1956019829e7c434a03e', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '91c259d5ee56c24fb870cf7be7d041bb9b8e139f', 'src/flutter/third_party/depot_tools': Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',