development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-04 07:19:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ad-hoc codesign Flutter.framework when code signing is disabled (#93556)

Browse source
This commit is contained in:
Jenn Magder 2021-11-12 12:56:03 -08:00 committed by GitHub
parent 4ec54e2966
commit a25dca4a06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/flutter_tools/lib/src/build_system/targets/ios.dart
View file

@ -625,9 +625,9 @@ Future<void> _createStubAppFramework(File outputFile, Environment environment,
}
void _signFramework(Environment environment, String binaryPath, BuildMode buildMode) {
final String codesignIdentity = environment.defines[kCodesignIdentity];
String codesignIdentity = environment.defines[kCodesignIdentity];
if (codesignIdentity == null || codesignIdentity.isEmpty) {
return;
codesignIdentity = '-';
}
final ProcessResult result = environment.processManager.runSync(<String>[
'codesign',

50
packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart
View file

@ -72,7 +72,8 @@ void main() {
testUsingContext('DebugUniversalFramework creates simulator binary', () async {
environment.defines[kIosArchs] = 'x86_64';
environment.defines[kSdkRoot] = 'path/to/iPhoneSimulator.sdk';
processManager.addCommand(
final String appFrameworkPath = environment.buildDir.childDirectory('App.framework').childFile('App').path;
processManager.addCommands(<FakeCommand>[
FakeCommand(command: <String>[
'xcrun',
'clang',
@ -98,12 +99,17 @@ void main() {
'-isysroot',
'path/to/iPhoneSimulator.sdk',
'-o',
environment.buildDir
.childDirectory('App.framework')
.childFile('App')
.path,
appFrameworkPath,
]),
);
FakeCommand(command: <String>[
'codesign',
'--force',
'--sign',
'-',
'--timestamp=none',
appFrameworkPath,
]),
]);
await const DebugUniversalFramework().build(environment);
expect(processManager.hasRemainingExpectations, isFalse);
@ -116,7 +122,8 @@ void main() {
testUsingContext('DebugUniversalFramework creates expected binary with arm64 only arch', () async {
environment.defines[kIosArchs] = 'arm64';
environment.defines[kSdkRoot] = 'path/to/iPhoneOS.sdk';
processManager.addCommand(
final String appFrameworkPath = environment.buildDir.childDirectory('App.framework').childFile('App').path;
processManager.addCommands(<FakeCommand>[
FakeCommand(command: <String>[
'xcrun',
'clang',
@ -129,12 +136,17 @@ void main() {
'.tmp_rand0', 'flutter_tools_stub_source.rand0', 'debug_app.cc')),
..._kSharedConfig,
'-o',
environment.buildDir
.childDirectory('App.framework')
.childFile('App')
.path,
appFrameworkPath,
]),
);
FakeCommand(command: <String>[
'codesign',
'--force',
'--sign',
'-',
'--timestamp=none',
appFrameworkPath,
]),
]);
await const DebugUniversalFramework().build(environment);
expect(processManager.hasRemainingExpectations, isFalse);
@ -317,6 +329,7 @@ void main() {
FakeCommand lipoCommandNonFatResult;
FakeCommand lipoVerifyArm64Command;
FakeCommand bitcodeStripCommand;
FakeCommand adHocCodesignCommand;
setUp(() {
final FileSystem fileSystem = MemoryFileSystem.test();
@ -353,6 +366,15 @@ void main() {
'-o',
binary.path,
]);
adHocCodesignCommand = FakeCommand(command: <String>[
'codesign',
'--force',
'--sign',
'-',
'--timestamp=none',
binary.path,
]);
});
testWithoutContext('iphonesimulator', () async {
@ -389,6 +411,7 @@ void main() {
'-verify_arch',
'x86_64',
]),
adHocCodesignCommand,
]);
await const DebugUnpackIOS().build(environment);
@ -538,6 +561,7 @@ void main() {
copyPhysicalFrameworkCommand,
lipoCommandNonFatResult,
lipoVerifyArm64Command,
adHocCodesignCommand,
]);
await const DebugUnpackIOS().build(environment);
@ -587,6 +611,7 @@ void main() {
'armv7',
binary.path,
]),
adHocCodesignCommand,
]);
await const DebugUnpackIOS().build(environment);
@ -658,6 +683,7 @@ void main() {
lipoCommandNonFatResult,
lipoVerifyArm64Command,
bitcodeStripCommand,
adHocCodesignCommand,
]);
await const DebugUnpackIOS().build(environment);