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
f3e567c9
Unverified
Commit
f3e567c9
authored
May 25, 2022
by
Jenn Magder
Committed by
GitHub
May 25, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create static plugin frameworks build ios-framework --static (#104576)
parent
78a0d3d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
5 deletions
+39
-5
build_ios_framework_module_test.dart
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
+32
-5
build_ios_framework.dart
...s/flutter_tools/lib/src/commands/build_ios_framework.dart
+7
-0
No files found.
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
View file @
f3e567c9
...
...
@@ -194,6 +194,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'App'
,
);
await
_checkDylib
(
appFrameworkPath
);
await
_checkBitcode
(
appFrameworkPath
,
mode
);
final
String
aotSymbols
=
await
_dylibSymbols
(
appFrameworkPath
);
...
...
@@ -292,6 +293,8 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'connectivity.framework'
,
'connectivity'
,
);
await
_checkDylib
(
pluginFrameworkPath
);
await
_checkBitcode
(
pluginFrameworkPath
,
mode
);
if
(!
await
_linksOnFlutter
(
pluginFrameworkPath
))
{
throw
TaskResult
.
failure
(
'
$pluginFrameworkPath
does not link on Flutter'
);
...
...
@@ -375,6 +378,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'FlutterPluginRegistrant.framework'
,
'FlutterPluginRegistrant'
,
);
await
_checkStatic
(
registrantFrameworkPath
);
await
_checkBitcode
(
registrantFrameworkPath
,
mode
);
checkFileExists
(
path
.
join
(
...
...
@@ -399,7 +403,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
}
// This builds all build modes' frameworks by default
section
(
'Build podspec'
);
section
(
'Build podspec
and static plugins
'
);
const
String
cocoapodsOutputDirectoryName
=
'flutter-frameworks-cocoapods'
;
...
...
@@ -411,6 +415,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'--cocoapods'
,
'--force'
,
// Allow podspec creation on master.
'--output=
$cocoapodsOutputDirectoryName
'
,
'--static'
,
],
);
});
...
...
@@ -422,11 +427,13 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
mode
,
'Flutter.podspec'
,
));
checkDirectoryExists
(
path
.
join
(
await
_checkDylib
(
path
.
join
(
cocoapodsOutputPath
,
mode
,
'App.xcframework'
,
'ios-arm64'
,
'App.framework'
,
'App'
,
));
if
(
Directory
(
path
.
join
(
...
...
@@ -439,16 +446,22 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'Unexpected FlutterPluginRegistrant.xcframework.'
);
}
checkDirectoryExists
(
path
.
join
(
await
_checkStatic
(
path
.
join
(
cocoapodsOutputPath
,
mode
,
'package_info.xcframework'
,
'ios-arm64'
,
'package_info.framework'
,
'package_info'
,
));
checkDirectoryExists
(
path
.
join
(
await
_checkStatic
(
path
.
join
(
cocoapodsOutputPath
,
mode
,
'connectivity.xcframework'
,
'ios-arm64'
,
'connectivity.framework'
,
'connectivity'
,
));
checkDirectoryExists
(
path
.
join
(
...
...
@@ -475,6 +488,20 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
}
}
Future
<
void
>
_checkDylib
(
String
pathToLibrary
)
async
{
final
String
binaryFileType
=
await
fileType
(
pathToLibrary
);
if
(!
binaryFileType
.
contains
(
'dynamically linked'
))
{
throw
TaskResult
.
failure
(
'
$pathToLibrary
is not a dylib, found:
$binaryFileType
'
);
}
}
Future
<
void
>
_checkStatic
(
String
pathToLibrary
)
async
{
final
String
binaryFileType
=
await
fileType
(
pathToLibrary
);
if
(!
binaryFileType
.
contains
(
'current ar archive random library'
))
{
throw
TaskResult
.
failure
(
'
$pathToLibrary
is not a static library, found:
$binaryFileType
'
);
}
}
Future
<
void
>
_checkBitcode
(
String
frameworkPath
,
String
mode
)
async
{
checkFileExists
(
frameworkPath
);
...
...
packages/flutter_tools/lib/src/commands/build_ios_framework.dart
View file @
f3e567c9
...
...
@@ -80,6 +80,9 @@ class BuildIOSFrameworkCommand extends BuildSubCommand {
..
addFlag
(
'cocoapods'
,
help:
'Produce a Flutter.podspec instead of an engine Flutter.xcframework (recommended if host app uses CocoaPods).'
,
)
..
addFlag
(
'static'
,
help:
'Build plugins as static frameworks. Link on, but do not embed these frameworks in the existing Xcode project.'
,
)
..
addOption
(
'output'
,
abbr:
'o'
,
valueHelp:
'path/to/directory/'
,
...
...
@@ -428,6 +431,8 @@ end
'
BITCODE_GENERATION_MODE
=
$bitcodeGenerationMode
',
'
ONLY_ACTIVE_ARCH
=
NO
', // No device targeted, so build all valid architectures.
'
BUILD_LIBRARY_FOR_DISTRIBUTION
=
YES
',
if (boolArg('
static
') ?? false)
'
MACH_O_TYPE
=
staticlib
',
];
RunResult buildPluginsResult = await globals.processUtils.run(
...
...
@@ -453,6 +458,8 @@ end
'
ENABLE_BITCODE
=
YES
', // Support host apps with bitcode enabled.
'
ONLY_ACTIVE_ARCH
=
NO
', // No device targeted, so build all valid architectures.
'
BUILD_LIBRARY_FOR_DISTRIBUTION
=
YES
',
if (boolArg('
static
') ?? false)
'
MACH_O_TYPE
=
staticlib
',
];
buildPluginsResult = await globals.processUtils.run(
...
...
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