Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
67aee9a0
Unverified
Commit
67aee9a0
authored
Jun 23, 2021
by
Jenn Magder
Committed by
GitHub
Jun 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid iOS app with extension checks that fail on M1 (#85087)
parent
fc9d3129
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
25 deletions
+13
-25
ios_app_with_extensions_test.dart
dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
+13
-25
No files found.
dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
View file @
67aee9a0
...
...
@@ -12,7 +12,6 @@ import 'package:flutter_devicelab/framework/framework.dart';
import
'package:flutter_devicelab/framework/ios.dart'
;
import
'package:flutter_devicelab/framework/task_result.dart'
;
import
'package:flutter_devicelab/framework/utils.dart'
;
import
'package:meta/meta.dart'
;
import
'package:path/path.dart'
as
path
;
Future
<
void
>
main
()
async
{
...
...
@@ -68,8 +67,8 @@ Future<void> main() async {
);
checkDirectoryExists
(
appBundle
);
await
_checkFlutterFrameworkArchs
(
appFrameworkPath
,
isSimulator:
false
);
await
_checkFlutterFrameworkArchs
(
flutterFrameworkPath
,
isSimulator:
false
);
await
_checkFlutterFrameworkArchs
(
appFrameworkPath
);
await
_checkFlutterFrameworkArchs
(
flutterFrameworkPath
);
// Check the watch extension framework added in the Podfile
// is in place with the expected watch archs.
...
...
@@ -101,8 +100,8 @@ Future<void> main() async {
});
checkDirectoryExists
(
appBundle
);
await
_checkFlutterFrameworkArchs
(
appFrameworkPath
,
isSimulator:
false
);
await
_checkFlutterFrameworkArchs
(
flutterFrameworkPath
,
isSimulator:
false
);
await
_checkFlutterFrameworkArchs
(
appFrameworkPath
);
await
_checkFlutterFrameworkArchs
(
flutterFrameworkPath
);
unawaited
(
_checkWatchExtensionFrameworkArchs
(
watchExtensionFrameworkPath
));
section
(
'Clean build'
);
...
...
@@ -252,22 +251,18 @@ Future<void> main() async {
)).
path
;
checkDirectoryExists
(
simulatorAppBundle
);
final
String
simulatorAppFrameworkPath
=
path
.
join
(
checkFileExists
(
path
.
join
(
simulatorAppBundle
,
'Frameworks'
,
'App.framework'
,
'App'
,
);
final
String
simulatorFlutterFrameworkPath
=
path
.
join
(
)
)
;
checkFileExists
(
path
.
join
(
simulatorAppBundle
,
'Frameworks'
,
'Flutter.framework'
,
'Flutter'
,
);
await
_checkFlutterFrameworkArchs
(
simulatorAppFrameworkPath
,
isSimulator:
true
);
await
_checkFlutterFrameworkArchs
(
simulatorFlutterFrameworkPath
,
isSimulator:
true
);
));
return
TaskResult
.
success
(
null
);
}
catch
(
e
)
{
...
...
@@ -307,23 +302,16 @@ Future<void> main() async {
});
}
Future
<
void
>
_checkFlutterFrameworkArchs
(
String
frameworkPath
,
{
@required
bool
isSimulator
})
async
{
Future
<
void
>
_checkFlutterFrameworkArchs
(
String
frameworkPath
)
async
{
checkFileExists
(
frameworkPath
);
final
String
archs
=
await
fileType
(
frameworkPath
);
if
(
isSimulator
==
archs
.
contains
(
'armv7'
))
{
throw
TaskResult
.
failure
(
'
$frameworkPath
armv7 architecture unexpected'
);
}
if
(
isSimulator
==
archs
.
contains
(
'arm64'
))
{
throw
TaskResult
.
failure
(
'
$frameworkPath
arm64 architecture unexpected'
);
if
(!
archs
.
contains
(
'arm64'
))
{
throw
TaskResult
.
failure
(
'
$frameworkPath
arm64 architecture missing'
);
}
if
(
isSimulator
!=
archs
.
contains
(
'x86_64'
))
{
throw
TaskResult
.
failure
(
'
$frameworkPath
x86_64 architecture unexpected'
);
if
(
archs
.
contains
(
'x86_64'
))
{
throw
TaskResult
.
failure
(
'
$frameworkPath
x86_64 architecture unexpectedly present'
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment