firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check ios-arm64_x86_64-simulator directory when validating codesigning entitlement (#85265)

Browse Source
This commit is contained in:
Jenn Magder 2021-06-28 17:01:06 -07:00 committed by GitHub
parent 0dca2ff13e
commit 24d608b2ba
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

@ -180,11 +180,11 @@ class CodesignCommand extends Command<void> {
'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-arm64_armv7/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-arm64_x86_64-simulator/Flutter.framework/Flutter',
'artifacts/engine/ios-release/Flutter.xcframework/ios-arm64_armv7/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-arm64_x86_64-simulator/Flutter.framework/Flutter',
'artifacts/engine/ios/Flutter.xcframework/ios-arm64_armv7/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-arm64_x86_64-simulator/Flutter.framework/Flutter',
'artifacts/ios-deploy/ios-deploy', 'artifacts/ios-deploy/ios-deploy',
] ]
.map((String relativePath) => .map((String relativePath) =>

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

@ -84,7 +84,7 @@ void main() {
fileSystem fileSystem
.directory(xcframeworkPath) .directory(xcframeworkPath)
.childDirectory('ios-x86_64-simulator') .childDirectory('ios-arm64_x86_64-simulator')
.childDirectory('Flutter.framework') .childDirectory('Flutter.framework')
.createSync(recursive: true); .createSync(recursive: true);
fileSystem fileSystem
@ -98,7 +98,7 @@ void main() {
mode: BuildMode.release, mode: BuildMode.release,
environmentType: EnvironmentType.simulator), environmentType: EnvironmentType.simulator),
fileSystem.path fileSystem.path
.join(xcframeworkPath, 'ios-x86_64-simulator', 'Flutter.framework'), .join(xcframeworkPath, 'ios-arm64_x86_64-simulator', 'Flutter.framework'),
); );
expect( expect(
artifacts.getArtifactPath(Artifact.flutterFramework, artifacts.getArtifactPath(Artifact.flutterFramework,
@ -249,7 +249,7 @@ void main() {
fileSystem fileSystem
.directory(xcframeworkPath) .directory(xcframeworkPath)
.childDirectory('ios-x86_64-simulator') .childDirectory('ios-arm64_x86_64-simulator')
.childDirectory('Flutter.framework') .childDirectory('Flutter.framework')
.createSync(recursive: true); .createSync(recursive: true);
fileSystem fileSystem
@ -265,7 +265,7 @@ void main() {
environmentType: EnvironmentType.simulator, environmentType: EnvironmentType.simulator,
), ),
fileSystem.path fileSystem.path
.join(xcframeworkPath, 'ios-x86_64-simulator', 'Flutter.framework'), .join(xcframeworkPath, 'ios-arm64_x86_64-simulator', 'Flutter.framework'),
); );
expect( expect(
artifacts.getArtifactPath( artifacts.getArtifactPath(