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

Commit b735b76

Browse files
gmackallgmackall
authored
Delete engine v1 android embedding (#51229)
Fixes flutter/flutter#143531 Also fixes a random typo I found TODO to test this: -test the framework against this as well, probably with a dummy PR changing the engine commit to my branch if this is possible -figure out if the old embedding is used in g3 at all -~figure out exactly what the ShimPluginRegistry/ShimRegistrar are doing, and if fully deleting them was right~ (see #51229 (comment)) [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent a17f8d1 commit b735b76

23 files changed

+8
-3574
lines changed

‎ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41186,13 +41186,6 @@ ORIGIN: ../../../flutter/shell/platform/android/io/flutter/Build.java + ../../..
4118641186
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/BuildConfig.java + ../../../flutter/LICENSE
4118741187
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java + ../../../flutter/LICENSE
4118841188
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/Log.java + ../../../flutter/LICENSE
41189-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java + ../../../flutter/LICENSE
41190-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java + ../../../flutter/LICENSE
41191-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java + ../../../flutter/LICENSE
41192-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java + ../../../flutter/LICENSE
41193-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java + ../../../flutter/LICENSE
41194-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java + ../../../flutter/LICENSE
41195-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java + ../../../flutter/LICENSE
4119641189
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java + ../../../flutter/LICENSE
4119741190
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java + ../../../flutter/LICENSE
4119841191
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java + ../../../flutter/LICENSE
@@ -41248,8 +41241,6 @@ ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plug
4124841241
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java + ../../../flutter/LICENSE
4124941242
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java + ../../../flutter/LICENSE
4125041243
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java + ../../../flutter/LICENSE
41251-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java + ../../../flutter/LICENSE
41252-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java + ../../../flutter/LICENSE
4125341244
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java + ../../../flutter/LICENSE
4125441245
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java + ../../../flutter/LICENSE
4125541246
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java + ../../../flutter/LICENSE
@@ -41321,10 +41312,7 @@ ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java +
4132141312
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java + ../../../flutter/LICENSE
4132241313
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java + ../../../flutter/LICENSE
4132341314
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java + ../../../flutter/LICENSE
41324-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java + ../../../flutter/LICENSE
41325-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java + ../../../flutter/LICENSE
4132641315
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java + ../../../flutter/LICENSE
41327-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java + ../../../flutter/LICENSE
4132841316
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java + ../../../flutter/LICENSE
4132941317
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java + ../../../flutter/LICENSE
4133041318
ORIGIN: ../../../flutter/shell/platform/android/jni/jni_mock.h + ../../../flutter/LICENSE
@@ -44068,13 +44056,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/Build.java
4406844056
FILE: ../../../flutter/shell/platform/android/io/flutter/BuildConfig.java
4406944057
FILE: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java
4407044058
FILE: ../../../flutter/shell/platform/android/io/flutter/Log.java
44071-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
44072-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
44073-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
44074-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java
44075-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
44076-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java
44077-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
4407844059
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
4407944060
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java
4408044061
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
@@ -44133,8 +44114,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugin
4413344114
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java
4413444115
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java
4413544116
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java
44136-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
44137-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
4413844117
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java
4413944118
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
4414044119
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java
@@ -44214,10 +44193,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java
4421444193
FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
4421544194
FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java
4421644195
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java
44217-
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java
44218-
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java
4421944196
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java
44220-
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java
4422144197
FILE: ../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java
4422244198
FILE: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java
4422344199
FILE: ../../../flutter/shell/platform/android/jni/jni_mock.h

‎shell/platform/android/AndroidManifest.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,13 @@
33
Use of this source code is governed by a BSD-style license that can be
44
found in the LICENSE file.
55
-->
6-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.app" android:versionCode="1" android:versionName="0.0.1">
6+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.embedding" android:versionCode="1" android:versionName="0.0.1">
77

88
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
99
<uses-permission android:name="android.permission.INTERNET" />
1010
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1111
<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true" />
1212

13-
<application android:label="Flutter Shell" android:name="FlutterApplication" android:debuggable="true">
14-
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
15-
android:hardwareAccelerated="true"
16-
android:launchMode="standard"
17-
android:name="FlutterActivity"
18-
android:theme="@android:style/Theme.Black.NoTitleBar"
19-
android:windowSoftInputMode="adjustResize"
20-
android:exported="true">
21-
<intent-filter>
22-
<action android:name="android.intent.action.MAIN" />
23-
<category android:name="android.intent.category.LAUNCHER" />
24-
</intent-filter>
25-
</activity>
26-
</application>
27-
2813
<!-- Required for io.flutter.plugin.text.ProcessTextPlugin to query activities that can process text. -->
2914
<queries>
3015
<intent>

‎shell/platform/android/BUILD.gn

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,6 @@ android_java_sources = [
198198
"io/flutter/Build.java",
199199
"io/flutter/FlutterInjector.java",
200200
"io/flutter/Log.java",
201-
"io/flutter/app/FlutterActivity.java",
202-
"io/flutter/app/FlutterActivityDelegate.java",
203-
"io/flutter/app/FlutterActivityEvents.java",
204-
"io/flutter/app/FlutterApplication.java",
205-
"io/flutter/app/FlutterFragmentActivity.java",
206-
"io/flutter/app/FlutterPlayStoreSplitApplication.java",
207-
"io/flutter/app/FlutterPluginRegistry.java",
208201
"io/flutter/embedding/android/AndroidTouchProcessor.java",
209202
"io/flutter/embedding/android/ExclusiveAppComponent.java",
210203
"io/flutter/embedding/android/FlutterActivity.java",
@@ -263,8 +256,6 @@ android_java_sources = [
263256
"io/flutter/embedding/engine/plugins/service/ServiceAware.java",
264257
"io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java",
265258
"io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java",
266-
"io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java",
267-
"io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java",
268259
"io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java",
269260
"io/flutter/embedding/engine/renderer/FlutterRenderer.java",
270261
"io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java",
@@ -344,10 +335,7 @@ android_java_sources = [
344335
"io/flutter/view/AccessibilityBridge.java",
345336
"io/flutter/view/AccessibilityViewEmbedder.java",
346337
"io/flutter/view/FlutterCallbackInformation.java",
347-
"io/flutter/view/FlutterMain.java",
348-
"io/flutter/view/FlutterNativeView.java",
349338
"io/flutter/view/FlutterRunArguments.java",
350-
"io/flutter/view/FlutterView.java",
351339
"io/flutter/view/TextureRegistry.java",
352340
"io/flutter/view/VsyncWaiter.java",
353341
]

‎shell/platform/android/io/flutter/app/FlutterActivity.java

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)