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

Commit 2e432ec

Browse files
author
The one with the braid (she/her) | Dфҿ mit dem Zopf (sie/ihr)
authored
chore: enable Flutter Android workflow on aarch64 (#113829)
- removes invalid arch check on Android workflow in order to enable Android development on any device supported Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf> Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
1 parent c1ceda4 commit 2e432ec

File tree

5 files changed

+8
-33
lines changed

5 files changed

+8
-33
lines changed

‎packages/flutter_tools/lib/src/android/android_workflow.dart‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,14 @@ class AndroidWorkflow implements Workflow {
4444
AndroidWorkflow({
4545
required AndroidSdk? androidSdk,
4646
required FeatureFlags featureFlags,
47-
required OperatingSystemUtils operatingSystemUtils,
4847
}) : _androidSdk = androidSdk,
49-
_featureFlags = featureFlags,
50-
_operatingSystemUtils = operatingSystemUtils;
48+
_featureFlags = featureFlags;
5149

5250
final AndroidSdk? _androidSdk;
5351
final FeatureFlags _featureFlags;
54-
final OperatingSystemUtils _operatingSystemUtils;
5552

5653
@override
57-
bool get appliesToHostPlatform => _featureFlags.isAndroidEnabled
58-
// Android Studio is not currently supported on Linux Arm64 Hosts.
59-
&& _operatingSystemUtils.hostPlatform != HostPlatform.linux_arm64;
54+
bool get appliesToHostPlatform => _featureFlags.isAndroidEnabled;
6055

6156
@override
6257
bool get canListDevices => appliesToHostPlatform && _androidSdk != null

‎packages/flutter_tools/lib/src/context_runner.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ Future<T> runInContext<T>(
120120
AndroidWorkflow: () => AndroidWorkflow(
121121
androidSdk: globals.androidSdk,
122122
featureFlags: featureFlags,
123-
operatingSystemUtils: globals.os,
124123
),
125124
ApplicationPackageFactory: () => FlutterApplicationPackageFactory(
126125
userMessages: globals.userMessages,

‎packages/flutter_tools/test/general.shard/android/android_device_discovery_test.dart‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ void main() {
2323
androidWorkflow = AndroidWorkflow(
2424
androidSdk: FakeAndroidSdk(),
2525
featureFlags: TestFeatureFlags(),
26-
operatingSystemUtils: FakeOperatingSystemUtils(),
2726
);
2827
});
2928

@@ -34,7 +33,6 @@ void main() {
3433
androidWorkflow: AndroidWorkflow(
3534
androidSdk: FakeAndroidSdk(null),
3635
featureFlags: TestFeatureFlags(),
37-
operatingSystemUtils: FakeOperatingSystemUtils(),
3836
),
3937
processManager: FakeProcessManager.empty(),
4038
fileSystem: MemoryFileSystem.test(),
@@ -55,7 +53,6 @@ void main() {
5553
androidWorkflow: AndroidWorkflow(
5654
androidSdk: FakeAndroidSdk(),
5755
featureFlags: TestFeatureFlags(),
58-
operatingSystemUtils: FakeOperatingSystemUtils(),
5956
),
6057
processManager: fakeProcessManager,
6158
fileSystem: MemoryFileSystem.test(),
@@ -74,7 +71,6 @@ void main() {
7471
androidWorkflow: AndroidWorkflow(
7572
androidSdk: FakeAndroidSdk(null),
7673
featureFlags: TestFeatureFlags(),
77-
operatingSystemUtils: FakeOperatingSystemUtils(),
7874
),
7975
processManager: FakeProcessManager.empty(),
8076
fileSystem: MemoryFileSystem.test(),
@@ -116,7 +112,6 @@ void main() {
116112
featureFlags: TestFeatureFlags(
117113
isAndroidEnabled: false,
118114
),
119-
operatingSystemUtils: FakeOperatingSystemUtils(),
120115
),
121116
processManager: FakeProcessManager.any(),
122117
fileSystem: MemoryFileSystem.test(),

‎packages/flutter_tools/test/general.shard/android/android_workflow_test.dart‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ void main() {
3939
final AndroidWorkflow androidWorkflow = AndroidWorkflow(
4040
featureFlags: TestFeatureFlags(),
4141
androidSdk: null,
42-
operatingSystemUtils: FakeOperatingSystemUtils(),
4342
);
4443

4544
expect(androidWorkflow.canLaunchDevices, false);
@@ -53,28 +52,26 @@ void main() {
5352
final AndroidWorkflow androidWorkflow = AndroidWorkflow(
5453
featureFlags: TestFeatureFlags(),
5554
androidSdk: androidSdk,
56-
operatingSystemUtils: FakeOperatingSystemUtils(),
5755
);
5856

5957
expect(androidWorkflow.canLaunchDevices, false);
6058
expect(androidWorkflow.canListDevices, false);
6159
expect(androidWorkflow.canListEmulators, false);
6260
});
6361

64-
// Android Studio is not currently supported on Linux Arm64 hosts.
65-
testWithoutContext('Not supported AndroidStudio on Linux Arm Hosts', () {
62+
// Android SDK is actually supported on Linux Arm64 hosts.
63+
testWithoutContext('Support for Android SDK on Linux Arm Hosts', () {
6664
final FakeAndroidSdk androidSdk = FakeAndroidSdk();
6765
androidSdk.adbPath = null;
6866
final AndroidWorkflow androidWorkflow = AndroidWorkflow(
6967
featureFlags: TestFeatureFlags(),
7068
androidSdk: androidSdk,
71-
operatingSystemUtils: CustomFakeOperatingSystemUtils(hostPlatform: HostPlatform.linux_arm64),
7269
);
7370

74-
expect(androidWorkflow.appliesToHostPlatform, false);
75-
expect(androidWorkflow.canLaunchDevices, false);
76-
expect(androidWorkflow.canListDevices, false);
77-
expect(androidWorkflow.canListEmulators, false);
71+
expect(androidWorkflow.appliesToHostPlatform, isTrue);
72+
expect(androidWorkflow.canLaunchDevices, isFalse);
73+
expect(androidWorkflow.canListDevices, isFalse);
74+
expect(androidWorkflow.canListEmulators, isFalse);
7875
});
7976

8077
testWithoutContext('AndroidWorkflow is disabled if feature is disabled', () {
@@ -83,7 +80,6 @@ void main() {
8380
final AndroidWorkflow androidWorkflow = AndroidWorkflow(
8481
featureFlags: TestFeatureFlags(isAndroidEnabled: false),
8582
androidSdk: androidSdk,
86-
operatingSystemUtils: FakeOperatingSystemUtils(),
8783
);
8884

8985
expect(androidWorkflow.appliesToHostPlatform, false);
@@ -98,7 +94,6 @@ void main() {
9894
final AndroidWorkflow androidWorkflow = AndroidWorkflow(
9995
featureFlags: TestFeatureFlags(),
10096
androidSdk: androidSdk,
101-
operatingSystemUtils: FakeOperatingSystemUtils(),
10297
);
10398

10499
expect(androidWorkflow.appliesToHostPlatform, true);
@@ -114,7 +109,6 @@ void main() {
114109
final AndroidWorkflow androidWorkflow = AndroidWorkflow(
115110
featureFlags: TestFeatureFlags(),
116111
androidSdk: androidSdk,
117-
operatingSystemUtils: FakeOperatingSystemUtils(),
118112
);
119113

120114
expect(androidWorkflow.appliesToHostPlatform, true);

‎packages/flutter_tools/test/general.shard/emulator_test.dart‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ void main() {
7979
androidWorkflow: AndroidWorkflow(
8080
androidSdk: sdk,
8181
featureFlags: TestFeatureFlags(),
82-
operatingSystemUtils: FakeOperatingSystemUtils(),
8382
),
8483
);
8584

@@ -101,7 +100,6 @@ void main() {
101100
androidWorkflow: AndroidWorkflow(
102101
androidSdk: sdk,
103102
featureFlags: TestFeatureFlags(),
104-
operatingSystemUtils: FakeOperatingSystemUtils(),
105103
),
106104
);
107105

@@ -116,7 +114,6 @@ void main() {
116114
androidWorkflow: AndroidWorkflow(
117115
androidSdk: sdk,
118116
featureFlags: TestFeatureFlags(),
119-
operatingSystemUtils: FakeOperatingSystemUtils(),
120117
),
121118
fileSystem: fileSystem,
122119
);
@@ -144,7 +141,6 @@ void main() {
144141
androidWorkflow: AndroidWorkflow(
145142
androidSdk: sdk,
146143
featureFlags: TestFeatureFlags(),
147-
operatingSystemUtils: FakeOperatingSystemUtils(),
148144
),
149145
);
150146
final CreateEmulatorResult result = await emulatorManager.createEmulator();
@@ -186,7 +182,6 @@ void main() {
186182
androidWorkflow: AndroidWorkflow(
187183
androidSdk: sdk,
188184
featureFlags: TestFeatureFlags(),
189-
operatingSystemUtils: FakeOperatingSystemUtils(),
190185
),
191186
);
192187
final CreateEmulatorResult result = await emulatorManager.createEmulator();
@@ -223,7 +218,6 @@ void main() {
223218
androidWorkflow: AndroidWorkflow(
224219
androidSdk: sdk,
225220
featureFlags: TestFeatureFlags(),
226-
operatingSystemUtils: FakeOperatingSystemUtils(),
227221
),
228222
);
229223
final CreateEmulatorResult result = await emulatorManager.createEmulator(name: 'test');
@@ -262,7 +256,6 @@ void main() {
262256
androidWorkflow: AndroidWorkflow(
263257
androidSdk: sdk,
264258
featureFlags: TestFeatureFlags(),
265-
operatingSystemUtils: FakeOperatingSystemUtils(),
266259
),
267260
);
268261
final CreateEmulatorResult result = await emulatorManager.createEmulator(name: 'existing-avd-1');
@@ -304,7 +297,6 @@ void main() {
304297
androidWorkflow: AndroidWorkflow(
305298
androidSdk: sdk,
306299
featureFlags: TestFeatureFlags(),
307-
operatingSystemUtils: FakeOperatingSystemUtils(),
308300
),
309301
);
310302
final CreateEmulatorResult result = await emulatorManager.createEmulator();

0 commit comments

Comments
 (0)