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
231c1a4b
Unverified
Commit
231c1a4b
authored
Mar 28, 2022
by
Jenn Magder
Committed by
GitHub
Mar 28, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass ARCHS build setting to flutter assemble on macOS (#100811)
parent
81078484
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
macos_assemble.sh
packages/flutter_tools/bin/macos_assemble.sh
+1
-1
macos_content_validation_test.dart
...test/integration.shard/macos_content_validation_test.dart
+15
-1
No files found.
packages/flutter_tools/bin/macos_assemble.sh
View file @
231c1a4b
...
...
@@ -70,7 +70,7 @@ BuildApp() {
"assemble"
"--no-version-check"
"-dTargetPlatform=darwin"
"-dDarwinArchs=
x86_64 arm64
"
"-dDarwinArchs=
${
ARCHS
}
"
"-dTargetFile=
${
target_path
}
"
"-dBuildMode=
${
build_mode
}
"
"-dTreeShakeIcons=
${
TREE_SHAKE_ICONS
}
"
...
...
packages/flutter_tools/test/integration.shard/macos_content_validation_test.dart
View file @
231c1a4b
...
...
@@ -79,7 +79,21 @@ void main() {
'App.framework'
,
));
expect
(
outputAppFramework
.
childFile
(
'App'
),
exists
);
final
File
outputAppFrameworkBinary
=
outputAppFramework
.
childFile
(
'App'
);
final
String
archs
=
processManager
.
runSync
(
<
String
>[
'file'
,
outputAppFrameworkBinary
.
path
],
).
stdout
as
String
;
final
bool
containsX64
=
archs
.
contains
(
'Mach-O 64-bit dynamically linked shared library x86_64'
);
final
bool
containsArm
=
archs
.
contains
(
'Mach-O 64-bit dynamically linked shared library arm64'
);
if
(
buildModeLower
==
'debug'
)
{
// Only build the architecture matching the machine running this test, not both.
expect
(
containsX64
^
containsArm
,
isTrue
,
reason:
'Unexpected architecture
$archs
'
);
}
else
{
expect
(
containsX64
,
isTrue
,
reason:
'Unexpected architecture
$archs
'
);
expect
(
containsArm
,
isTrue
,
reason:
'Unexpected architecture
$archs
'
);
}
expect
(
outputAppFramework
.
childLink
(
'Resources'
),
exists
);
final
File
vmSnapshot
=
fileSystem
.
file
(
fileSystem
.
path
.
join
(
...
...
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