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
761b109b
Unverified
Commit
761b109b
authored
Jan 24, 2022
by
Zachary Anderson
Committed by
GitHub
Jan 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust lipo thinning input/output for macOS (#97111)
parent
0978b96e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
macos.dart
...ges/flutter_tools/lib/src/build_system/targets/macos.dart
+6
-2
macos_test.dart
...s/test/general.shard/build_system/targets/macos_test.dart
+6
-4
No files found.
packages/flutter_tools/lib/src/build_system/targets/macos.dart
View file @
761b109b
...
...
@@ -36,7 +36,7 @@ abstract class UnpackMacOS extends Target {
@override
List
<
Source
>
get
outputs
=>
const
<
Source
>[
Source
.
pattern
(
'{OUTPUT_DIR}/FlutterMacOS.framework/FlutterMacOS'
),
Source
.
pattern
(
'{OUTPUT_DIR}/FlutterMacOS.framework/
Versions/A/
FlutterMacOS'
),
];
@override
...
...
@@ -67,7 +67,11 @@ abstract class UnpackMacOS extends Target {
);
}
final
File
frameworkBinary
=
environment
.
outputDir
.
childDirectory
(
'FlutterMacOS.framework'
).
childFile
(
'FlutterMacOS'
);
final
File
frameworkBinary
=
environment
.
outputDir
.
childDirectory
(
'FlutterMacOS.framework'
)
.
childDirectory
(
'Versions'
)
.
childDirectory
(
'A'
)
.
childFile
(
'FlutterMacOS'
);
final
String
frameworkBinaryPath
=
frameworkBinary
.
path
;
if
(!
frameworkBinary
.
existsSync
())
{
throw
Exception
(
'Binary
$frameworkBinaryPath
does not exist, cannot thin'
);
...
...
packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
View file @
761b109b
...
...
@@ -51,8 +51,10 @@ void main() {
);
binary
=
environment
.
outputDir
.
childDirectory
(
'FlutterMacOS.framework'
)
.
childFile
(
'FlutterMacOS'
);
.
childDirectory
(
'FlutterMacOS.framework'
)
.
childDirectory
(
'Versions'
)
.
childDirectory
(
'A'
)
.
childFile
(
'FlutterMacOS'
);
copyFrameworkCommand
=
FakeCommand
(
command:
<
String
>[
...
...
@@ -109,7 +111,7 @@ void main() {
throwsA
(
isException
.
having
(
(
Exception
exception
)
=>
exception
.
toString
(),
'description'
,
contains
(
'FlutterMacOS.framework/FlutterMacOS does not exist, cannot thin'
),
contains
(
'FlutterMacOS.framework/
Versions/A/
FlutterMacOS does not exist, cannot thin'
),
)),
);
},
overrides:
<
Type
,
Generator
>{
...
...
@@ -155,7 +157,7 @@ void main() {
await
const
DebugUnpackMacOS
().
build
(
environment
);
expect
(
logger
.
traceText
,
contains
(
'Skipping lipo for non-fat file /FlutterMacOS.framework/FlutterMacOS'
));
expect
(
logger
.
traceText
,
contains
(
'Skipping lipo for non-fat file /FlutterMacOS.framework/
Versions/A/
FlutterMacOS'
));
});
testUsingContext
(
'thins fat framework'
,
()
async
{
...
...
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