From ddf9e3f645d26abb7f2b2d47eeec2bd6736372e0 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Tue, 20 Feb 2024 12:47:29 -0800
Subject: [PATCH 1/4] Use engine-local Android SDK, do not ignore file that
 should not exist.

---
 .gitignore                                     | 1 -
 testing/scenario_app/android/gradle.properties | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e589f08937259..15320f162f2ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,6 @@ unlinked_spec.ds
 **/android/gradlew
 **/android/gradlew.bat
 **/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
 *.jks
 
diff --git a/testing/scenario_app/android/gradle.properties b/testing/scenario_app/android/gradle.properties
index 0b5c48ae64de0..dd7f7323c2723 100644
--- a/testing/scenario_app/android/gradle.properties
+++ b/testing/scenario_app/android/gradle.properties
@@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
 android.builder.sdkDownload=false
+
+# Otherwise the default system SDK may be used, which is non-hermetic.
+sdk.dir=../../../../third_party/android_tools/sdk/

From 5259cc0a46c69b6a0811922dbfb57110d521a67f Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Tue, 20 Feb 2024 12:54:58 -0800
Subject: [PATCH 2/4] ++

---
 .gitignore                            | 1 -
 testing/scenario_app/android/BUILD.gn | 2 --
 2 files changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15320f162f2ea..be9e96cceee3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ xcuserdata
 *.log
 *.pyc
 *.swp
-.DS_Store
 .atom/
 .buildlog/
 .history
diff --git a/testing/scenario_app/android/BUILD.gn b/testing/scenario_app/android/BUILD.gn
index 111b7be100ce0..da1e2dba1792f 100644
--- a/testing/scenario_app/android/BUILD.gn
+++ b/testing/scenario_app/android/BUILD.gn
@@ -51,7 +51,6 @@ gradle_task("build_apk") {
   gradle_project_dir = rebase_path(".")
   sources = _android_sources
   outputs = [ "$root_out_dir/scenario_app/app/outputs/apk/debug/app-debug.apk" ]
-
   deps = [
     ":android_lint",
     "//flutter/testing/scenario_app:scenario_app_snapshot",
@@ -64,7 +63,6 @@ gradle_task("build_test_apk") {
   gradle_project_dir = rebase_path(".")
   sources = _android_sources
   outputs = [ "$root_out_dir/scenario_app/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk" ]
-
   deps = [
     ":android_lint",
     "//flutter/testing/scenario_app:scenario_app_snapshot",

From 40ebb47cf73f3983256e6043f5e036dbd774e7e9 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Tue, 20 Feb 2024 12:59:43 -0800
Subject: [PATCH 3/4] Revert did not work.

---
 testing/scenario_app/android/gradle.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/testing/scenario_app/android/gradle.properties b/testing/scenario_app/android/gradle.properties
index dd7f7323c2723..0b5c48ae64de0 100644
--- a/testing/scenario_app/android/gradle.properties
+++ b/testing/scenario_app/android/gradle.properties
@@ -2,6 +2,3 @@ org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
 android.builder.sdkDownload=false
-
-# Otherwise the default system SDK may be used, which is non-hermetic.
-sdk.dir=../../../../third_party/android_tools/sdk/

From d929632a1511d0e7ca234119c1768e1c1e083ee5 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Tue, 20 Feb 2024 13:00:43 -0800
Subject: [PATCH 4/4] ++

---
 testing/scenario_app/android/BUILD.gn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testing/scenario_app/android/BUILD.gn b/testing/scenario_app/android/BUILD.gn
index da1e2dba1792f..111b7be100ce0 100644
--- a/testing/scenario_app/android/BUILD.gn
+++ b/testing/scenario_app/android/BUILD.gn
@@ -51,6 +51,7 @@ gradle_task("build_apk") {
   gradle_project_dir = rebase_path(".")
   sources = _android_sources
   outputs = [ "$root_out_dir/scenario_app/app/outputs/apk/debug/app-debug.apk" ]
+
   deps = [
     ":android_lint",
     "//flutter/testing/scenario_app:scenario_app_snapshot",
@@ -63,6 +64,7 @@ gradle_task("build_test_apk") {
   gradle_project_dir = rebase_path(".")
   sources = _android_sources
   outputs = [ "$root_out_dir/scenario_app/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk" ]
+
   deps = [
     ":android_lint",
     "//flutter/testing/scenario_app:scenario_app_snapshot",