From 297270a06e0815feea075229ad08729d2d8192b5 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Mon, 4 Mar 2024 08:49:15 -0800
Subject: [PATCH 1/4] Guard against API 22

---
 .../io/flutter/view/AccessibilityBridge.java  |   2 +-
 tools/android_lint/project.xml                | 320 +++++++++---------
 2 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/shell/platform/android/io/flutter/view/AccessibilityBridge.java b/shell/platform/android/io/flutter/view/AccessibilityBridge.java
index 84b0a48d4a2e1..4536897225a23 100644
--- a/shell/platform/android/io/flutter/view/AccessibilityBridge.java
+++ b/shell/platform/android/io/flutter/view/AccessibilityBridge.java
@@ -763,7 +763,7 @@ public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
       result.setParent(rootAccessibilityView);
     }
 
-    if (semanticsNode.previousNodeId != -1) {
+    if (semanticsNode.previousNodeId != -1 && Build.VERSION.SDK_INT >= 22) {
       result.setTraversalAfter(rootAccessibilityView, semanticsNode.previousNodeId);
     }
 
diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml
index 21593ab63ad0b..310d60cf3cea8 100644
--- a/tools/android_lint/project.xml
+++ b/tools/android_lint/project.xml
@@ -1,166 +1,166 @@
 <!-- THIS FILE IS GENERATED. PLEASE USE THE INCLUDED DART PROGRAM  WHICH -->
 <!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE       -->
 <project>
-  <sdk dir="../../../third_party/android_tools/sdk" />
+  <sdk dir="../third_party/android_tools/sdk" />
   <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-U">
-  <manifest file="../../../flutter/shell/platform/android/AndroidManifest.xml" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/util/KeyCodes.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/util/FakeKeyEvent.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/embedding/android/RobolectricFlutterActivity.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/CustomShadowContextImpl.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/external/FlutterLaunchTests.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/Preconditions.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/Predicate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/TraceSection.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardMap.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/RenderMode.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyChannelResponder.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyData.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/lifecycle/HiddenLifecycleReference.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderPluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverPluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformTaskQueue.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/RestorationChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONMethodCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONUtil.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MessageCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/ErrorLogResult.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONMessageCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/ActivityLifecycleListener.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/BinaryCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/FlutterException.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/StringCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardMessageCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodCall.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/EventChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextEditingDelta.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/ListenableEditingState.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/Log.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/BuildConfig.java" />
+  <manifest file="../flutter/shell/platform/android/AndroidManifest.xml" />
+    <src file="../flutter/shell/platform/android/test/io/flutter/util/KeyCodes.java" />
+    <src file="../flutter/shell/platform/android/test/io/flutter/util/FakeKeyEvent.java" />
+    <src file="../flutter/shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java" />
+    <src file="../flutter/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java" />
+    <src file="../flutter/shell/platform/android/test/io/flutter/embedding/android/RobolectricFlutterActivity.java" />
+    <src file="../flutter/shell/platform/android/test/io/flutter/CustomShadowContextImpl.java" />
+    <src file="../flutter/shell/platform/android/test/io/flutter/external/FlutterLaunchTests.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/util/Preconditions.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/util/ViewUtils.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/util/Predicate.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/util/TraceSection.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/util/PathUtils.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardMap.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/RenderMode.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyChannelResponder.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyData.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityAware.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityControlSurface.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/lifecycle/HiddenLifecycleReference.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderPluginBinding.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderAware.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderControlSurface.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverAware.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverControlSurface.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverPluginBinding.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformTaskQueue.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/RestorationChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/JSONMethodCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/JSONUtil.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MessageCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/ErrorLogResult.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/JSONMessageCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/ActivityLifecycleListener.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/BinaryCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/FlutterException.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/StringCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/StandardMessageCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MethodCodec.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MethodCall.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/EventChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MethodChannel.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/TextEditingDelta.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/ListenableEditingState.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/FlutterInjector.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/Log.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterView.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterMain.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java" />
+    <src file="../flutter/shell/platform/android/io/flutter/BuildConfig.java" />
   </module>
 </project>

From eccc8aef4a512dd96644be7ccd3c898ae8992113 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Mon, 4 Mar 2024 10:03:56 -0800
Subject: [PATCH 2/4] ignore project.xml, which is autogenerated by a tool

---
 tools/android_lint/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/android_lint/.gitignore b/tools/android_lint/.gitignore
index e44752dc2001b..f77f4ea7fb129 100644
--- a/tools/android_lint/.gitignore
+++ b/tools/android_lint/.gitignore
@@ -1 +1,2 @@
 lint_report/
+project.xml # autogenerated by the tool, run in CI.

From e868eb137450fcf4a462a5e4e0853383a492d5de Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Mon, 4 Mar 2024 10:05:14 -0800
Subject: [PATCH 3/4] oops

---
 tools/android_lint/project.xml | 166 ---------------------------------
 1 file changed, 166 deletions(-)
 delete mode 100644 tools/android_lint/project.xml

diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml
deleted file mode 100644
index 310d60cf3cea8..0000000000000
--- a/tools/android_lint/project.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!-- THIS FILE IS GENERATED. PLEASE USE THE INCLUDED DART PROGRAM  WHICH -->
-<!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE       -->
-<project>
-  <sdk dir="../third_party/android_tools/sdk" />
-  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-U">
-  <manifest file="../flutter/shell/platform/android/AndroidManifest.xml" />
-    <src file="../flutter/shell/platform/android/test/io/flutter/util/KeyCodes.java" />
-    <src file="../flutter/shell/platform/android/test/io/flutter/util/FakeKeyEvent.java" />
-    <src file="../flutter/shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java" />
-    <src file="../flutter/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java" />
-    <src file="../flutter/shell/platform/android/test/io/flutter/embedding/android/RobolectricFlutterActivity.java" />
-    <src file="../flutter/shell/platform/android/test/io/flutter/CustomShadowContextImpl.java" />
-    <src file="../flutter/shell/platform/android/test/io/flutter/external/FlutterLaunchTests.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/util/Preconditions.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/util/ViewUtils.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/util/Predicate.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/util/TraceSection.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/util/PathUtils.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardMap.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/RenderMode.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyChannelResponder.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/KeyData.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityAware.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityControlSurface.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/lifecycle/HiddenLifecycleReference.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderPluginBinding.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderAware.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderControlSurface.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverAware.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverControlSurface.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverPluginBinding.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformTaskQueue.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/RestorationChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/JSONMethodCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/JSONUtil.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MessageCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/ErrorLogResult.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/JSONMessageCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/ActivityLifecycleListener.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/BinaryCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/FlutterException.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/StringCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/StandardMessageCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MethodCodec.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MethodCall.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/EventChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/common/MethodChannel.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/TextEditingDelta.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/ListenableEditingState.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/FlutterInjector.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/Log.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterView.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterMain.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java" />
-    <src file="../flutter/shell/platform/android/io/flutter/BuildConfig.java" />
-  </module>
-</project>

From 87efa24f2b95addcda0f7c5500e4bda66a3218f6 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Mon, 4 Mar 2024 10:06:06 -0800
Subject: [PATCH 4/4] oops again

---
 tools/android_lint/.gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/android_lint/.gitignore b/tools/android_lint/.gitignore
index f77f4ea7fb129..c42d61497735f 100644
--- a/tools/android_lint/.gitignore
+++ b/tools/android_lint/.gitignore
@@ -1,2 +1,3 @@
 lint_report/
-project.xml # autogenerated by the tool, run in CI.
+# autogenerated by the tool, run in CI.
+project.xml