github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check ios-arm64_armv7 directory when validating codesigning entitlements (#85053)

Browse Source
This commit is contained in:
Jenn Magder 2021-06-23 16:46:03 -07:00 committed by GitHub
parent 49c08b7353
commit 042fd77ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/conductor/lib/codesign.dart
View File

@ -179,11 +179,11 @@ class CodesignCommand extends Command<void> {
'artifacts/engine/darwin-x64-release/FlutterMacOS.framework/Versions/A/FlutterMacOS', 'artifacts/engine/darwin-x64-release/FlutterMacOS.framework/Versions/A/FlutterMacOS',
'artifacts/engine/darwin-x64/FlutterMacOS.framework/Versions/A/FlutterMacOS', 'artifacts/engine/darwin-x64/FlutterMacOS.framework/Versions/A/FlutterMacOS',
'artifacts/engine/darwin-x64/font-subset', 'artifacts/engine/darwin-x64/font-subset',
'artifacts/engine/ios-profile/Flutter.xcframework/ios-armv7_arm64/Flutter.framework/Flutter', 'artifacts/engine/ios-profile/Flutter.xcframework/ios-arm64_armv7/Flutter.framework/Flutter',
'artifacts/engine/ios-profile/Flutter.xcframework/ios-x86_64-simulator/Flutter.framework/Flutter', 'artifacts/engine/ios-profile/Flutter.xcframework/ios-x86_64-simulator/Flutter.framework/Flutter',
'artifacts/engine/ios-release/Flutter.xcframework/ios-armv7_arm64/Flutter.framework/Flutter', 'artifacts/engine/ios-release/Flutter.xcframework/ios-arm64_armv7/Flutter.framework/Flutter',
'artifacts/engine/ios-release/Flutter.xcframework/ios-x86_64-simulator/Flutter.framework/Flutter', 'artifacts/engine/ios-release/Flutter.xcframework/ios-x86_64-simulator/Flutter.framework/Flutter',
'artifacts/engine/ios/Flutter.xcframework/ios-armv7_arm64/Flutter.framework/Flutter', 'artifacts/engine/ios/Flutter.xcframework/ios-arm64_armv7/Flutter.framework/Flutter',
'artifacts/engine/ios/Flutter.xcframework/ios-x86_64-simulator/Flutter.framework/Flutter', 'artifacts/engine/ios/Flutter.xcframework/ios-x86_64-simulator/Flutter.framework/Flutter',
'artifacts/ios-deploy/ios-deploy', 'artifacts/ios-deploy/ios-deploy',
] ]

8
packages/flutter_tools/test/general.shard/artifacts_test.dart
View File

@ -89,7 +89,7 @@ void main() {
.createSync(recursive: true); .createSync(recursive: true);
fileSystem fileSystem
.directory(xcframeworkPath) .directory(xcframeworkPath)
.childDirectory('ios-armv7_arm64') .childDirectory('ios-arm64_armv7')
.childDirectory('Flutter.framework') .childDirectory('Flutter.framework')
.createSync(recursive: true); .createSync(recursive: true);
expect( expect(
@ -103,7 +103,7 @@ void main() {
expect( expect(
artifacts.getArtifactPath(Artifact.flutterFramework, artifacts.getArtifactPath(Artifact.flutterFramework,
platform: TargetPlatform.ios, mode: BuildMode.release, environmentType: EnvironmentType.physical), platform: TargetPlatform.ios, mode: BuildMode.release, environmentType: EnvironmentType.physical),
fileSystem.path.join(xcframeworkPath, 'ios-armv7_arm64', 'Flutter.framework'), fileSystem.path.join(xcframeworkPath, 'ios-arm64_armv7', 'Flutter.framework'),
); );
expect( expect(
artifacts.getArtifactPath(Artifact.flutterXcframework, platform: TargetPlatform.ios, mode: BuildMode.release), artifacts.getArtifactPath(Artifact.flutterXcframework, platform: TargetPlatform.ios, mode: BuildMode.release),
@ -254,7 +254,7 @@ void main() {
.createSync(recursive: true); .createSync(recursive: true);
fileSystem fileSystem
.directory(xcframeworkPath) .directory(xcframeworkPath)
.childDirectory('ios-armv7_arm64') .childDirectory('ios-arm64_armv7')
.childDirectory('Flutter.framework') .childDirectory('Flutter.framework')
.createSync(recursive: true); .createSync(recursive: true);
expect( expect(
@ -275,7 +275,7 @@ void main() {
environmentType: EnvironmentType.physical, environmentType: EnvironmentType.physical,
), ),
fileSystem.path fileSystem.path
.join(xcframeworkPath, 'ios-armv7_arm64', 'Flutter.framework'), .join(xcframeworkPath, 'ios-arm64_armv7', 'Flutter.framework'),
); );
expect( expect(
artifacts.getArtifactPath( artifacts.getArtifactPath(