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
a9a35d10
Unverified
Commit
a9a35d10
authored
Nov 18, 2020
by
Jenn Magder
Committed by
GitHub
Nov 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop extra framework copy during build ios-framework (#70790)
parent
cfb63356
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
16 deletions
+5
-16
build_ios_framework.dart
...s/flutter_tools/lib/src/commands/build_ios_framework.dart
+0
-6
project.dart
packages/flutter_tools/lib/src/project.dart
+5
-10
No files found.
packages/flutter_tools/lib/src/commands/build_ios_framework.dart
View file @
a9a35d10
...
...
@@ -453,12 +453,6 @@ end
'
├─
Building
plugins
...
'
);
try {
// Regardless of the last "flutter build" build mode,
// copy the corresponding engine.
// A plugin framework built with bitcode must link against the bitcode version
// of Flutter.framework (Release).
_project.ios.copyEngineArtifactToProject(mode);
final String bitcodeGenerationMode = mode == BuildMode.release ?
'
bitcode
' : '
marker
'; // In release, force bitcode embedding without archiving.
...
...
packages/flutter_tools/lib/src/project.dart
View file @
a9a35d10
...
...
@@ -648,11 +648,11 @@ class IosProject extends FlutterProjectPlatform implements XcodeBasedProject {
ephemeralDirectory
,
);
}
copyEngineArtifactToProject
(
BuildMode
.
debug
);
_copyEngineArtifactToModule
(
BuildMode
.
debug
);
}
}
void
copyEngineArtifactToProject
(
BuildMode
mode
)
{
void
_copyEngineArtifactToModule
(
BuildMode
mode
)
{
// Copy podspec and framework from engine cache. The actual build mode
// doesn't actually matter as it will be overwritten by xcode_backend.sh.
// However, cocoapods will run before that script and requires something
...
...
@@ -662,8 +662,9 @@ class IosProject extends FlutterProjectPlatform implements XcodeBasedProject {
Artifact
.
flutterFramework
,
platform:
TargetPlatform
.
ios
,
mode:
mode
,
)
);
));
final
Directory
engineCopyDirectory
=
ephemeralDirectory
.
childDirectory
(
'Flutter'
).
childDirectory
(
'engine'
);
if
(
framework
.
existsSync
())
{
final
File
podspec
=
framework
.
parent
.
childFile
(
'Flutter.podspec'
);
globals
.
fsUtils
.
copyDirectorySync
(
...
...
@@ -711,12 +712,6 @@ class IosProject extends FlutterProjectPlatform implements XcodeBasedProject {
return
registryDirectory
.
childFile
(
'GeneratedPluginRegistrant.m'
);
}
Directory
get
engineCopyDirectory
{
return
isModule
?
ephemeralDirectory
.
childDirectory
(
'Flutter'
).
childDirectory
(
'engine'
)
:
hostAppRoot
.
childDirectory
(
'Flutter'
);
}
Future
<
void
>
_overwriteFromTemplate
(
String
path
,
Directory
target
)
async
{
final
Template
template
=
await
Template
.
fromName
(
path
,
...
...
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