Skip to content

F
Front-End
Unverified Commit 24d608b2 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub
Browse files
Options

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

parent 0dca2ff1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
dev/conductor/lib/codesign.dart
View file @ 24d608b2
...@@ -180,11 +180,11 @@ class CodesignCommand extends Command<void> { ...@@ -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) =>
......
packages/flutter_tools/test/general.shard/artifacts_test.dart
View file @ 24d608b2
...@@ -84,7 +84,7 @@ void main() { ...@@ -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() { ...@@ -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() { ...@@ -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() { ...@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab