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
03013ce4
Unverified
Commit
03013ce4
authored
Dec 07, 2020
by
Jenn Magder
Committed by
GitHub
Dec 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove manual Flutter linking for iOS projects (#71862)
parent
29f62b27
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
62 deletions
+0
-62
xcodeproj.dart
packages/flutter_tools/lib/src/ios/xcodeproj.dart
+0
-5
xcodeproj_test.dart
.../flutter_tools/test/general.shard/ios/xcodeproj_test.dart
+0
-57
No files found.
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View file @
03013ce4
...
...
@@ -181,11 +181,6 @@ List<String> _xcodeBuildSettingsLines({
xcodeBuildSettings
.
add
(
'SYMROOT=
\
${SOURCE_ROOT}
/../
${getIosBuildDirectory()}
'
);
}
// iOS does not link on Flutter in any build phase. Add the linker flag.
if
(!
useMacOSConfig
)
{
xcodeBuildSettings
.
add
(
r'OTHER_LDFLAGS=$(inherited) -framework Flutter'
);
}
if
(!
project
.
isModule
&&
useMacOSConfig
)
{
// For module projects we do not want to write the FLUTTER_FRAMEWORK_DIR
// explicitly. Rather we rely on the xcode backend script and the Podfile
...
...
packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
View file @
03013ce4
...
...
@@ -663,63 +663,6 @@ Information about project "Runner":
});
}
testUsingOsxContext
(
'sets OTHER_LDFLAGS for iOS'
,
()
async
{
when
(
mockArtifacts
.
getArtifactPath
(
Artifact
.
flutterFramework
,
platform:
TargetPlatform
.
ios
,
mode:
anyNamed
(
'mode'
),
environmentType:
anyNamed
(
'environmentType'
)))
.
thenReturn
(
fs
.
path
.
join
(
'engine'
,
'Flutter.framework'
));
when
(
mockArtifacts
.
engineOutPath
).
thenReturn
(
fs
.
path
.
join
(
'out'
,
'ios_profile_arm'
));
const
BuildInfo
buildInfo
=
BuildInfo
(
BuildMode
.
debug
,
null
,
treeShakeIcons:
false
);
final
FlutterProject
project
=
FlutterProject
.
fromPath
(
'path/to/project'
);
await
updateGeneratedXcodeProperties
(
project:
project
,
buildInfo:
buildInfo
,
);
final
File
config
=
fs
.
file
(
'path/to/project/ios/Flutter/Generated.xcconfig'
);
expect
(
config
.
existsSync
(),
isTrue
);
final
String
contents
=
config
.
readAsStringSync
();
expect
(
contents
.
contains
(
r'OTHER_LDFLAGS=$(inherited) -framework Flutter'
),
isTrue
);
final
File
buildPhaseScript
=
fs
.
file
(
'path/to/project/ios/Flutter/flutter_export_environment.sh'
);
expect
(
buildPhaseScript
.
existsSync
(),
isTrue
);
final
String
buildPhaseScriptContents
=
buildPhaseScript
.
readAsStringSync
();
expect
(
buildPhaseScriptContents
.
contains
(
r'OTHER_LDFLAGS=$(inherited) -framework Flutter'
),
isTrue
);
});
testUsingOsxContext
(
'do not set OTHER_LDFLAGS for macOS'
,
()
async
{
when
(
mockArtifacts
.
getArtifactPath
(
Artifact
.
flutterMacOSFramework
,
platform:
TargetPlatform
.
darwin_x64
,
mode:
anyNamed
(
'mode'
),
environmentType:
anyNamed
(
'environmentType'
)))
.
thenReturn
(
fs
.
path
.
join
(
'engine'
,
'FlutterMacOS.framework'
));
when
(
mockArtifacts
.
engineOutPath
).
thenReturn
(
fs
.
path
.
join
(
'out'
,
'ios_profile_arm'
));
const
BuildInfo
buildInfo
=
BuildInfo
(
BuildMode
.
debug
,
null
,
treeShakeIcons:
false
);
final
FlutterProject
project
=
FlutterProject
.
fromPath
(
'path/to/project'
);
await
updateGeneratedXcodeProperties
(
project:
project
,
buildInfo:
buildInfo
,
useMacOSConfig:
true
,
);
final
File
config
=
fs
.
file
(
'path/to/project/macos/Flutter/ephemeral/Flutter-Generated.xcconfig'
);
expect
(
config
.
existsSync
(),
isTrue
);
final
String
contents
=
config
.
readAsStringSync
();
expect
(
contents
.
contains
(
'OTHER_LDFLAGS'
),
isFalse
);
final
File
buildPhaseScript
=
fs
.
file
(
'path/to/project/macos/Flutter/ephemeral/flutter_export_environment.sh'
);
expect
(
buildPhaseScript
.
existsSync
(),
isTrue
);
final
String
buildPhaseScriptContents
=
buildPhaseScript
.
readAsStringSync
();
expect
(
buildPhaseScriptContents
.
contains
(
'OTHER_LDFLAGS'
),
isFalse
);
});
testUsingOsxContext
(
'sets ARCHS=armv7 when armv7 local engine is set'
,
()
async
{
when
(
mockArtifacts
.
getArtifactPath
(
Artifact
.
flutterFramework
,
platform:
TargetPlatform
.
ios
,
...
...
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