From 24d608b2baa83d63cabf7af7d9f673bbd8481167 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Mon, 28 Jun 2021 17:01:06 -0700
Subject: [PATCH] Check ios-arm64_x86_64-simulator directory when validating
 codesigning entitlement (#85265)

---
 dev/conductor/lib/codesign.dart                           | 6 +++---
 .../flutter_tools/test/general.shard/artifacts_test.dart  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/conductor/lib/codesign.dart b/dev/conductor/lib/codesign.dart
index f5dea304f5..8020eb37dd 100644
--- a/dev/conductor/lib/codesign.dart
+++ b/dev/conductor/lib/codesign.dart
@@ -180,11 +180,11 @@ class CodesignCommand extends Command<void> {
       'artifacts/engine/darwin-x64/FlutterMacOS.framework/Versions/A/FlutterMacOS',
       '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-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-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-x86_64-simulator/Flutter.framework/Flutter',
+      'artifacts/engine/ios/Flutter.xcframework/ios-arm64_x86_64-simulator/Flutter.framework/Flutter',
       'artifacts/ios-deploy/ios-deploy',
     ]
         .map((String relativePath) =>
diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart
index bfd4ffe777..5a25df9e9f 100644
--- a/packages/flutter_tools/test/general.shard/artifacts_test.dart
+++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart
@@ -84,7 +84,7 @@ void main() {
 
       fileSystem
           .directory(xcframeworkPath)
-          .childDirectory('ios-x86_64-simulator')
+          .childDirectory('ios-arm64_x86_64-simulator')
           .childDirectory('Flutter.framework')
           .createSync(recursive: true);
       fileSystem
@@ -98,7 +98,7 @@ void main() {
             mode: BuildMode.release,
             environmentType: EnvironmentType.simulator),
         fileSystem.path
-            .join(xcframeworkPath, 'ios-x86_64-simulator', 'Flutter.framework'),
+            .join(xcframeworkPath, 'ios-arm64_x86_64-simulator', 'Flutter.framework'),
       );
       expect(
         artifacts.getArtifactPath(Artifact.flutterFramework,
@@ -249,7 +249,7 @@ void main() {
 
       fileSystem
           .directory(xcframeworkPath)
-          .childDirectory('ios-x86_64-simulator')
+          .childDirectory('ios-arm64_x86_64-simulator')
           .childDirectory('Flutter.framework')
           .createSync(recursive: true);
       fileSystem
@@ -265,7 +265,7 @@ void main() {
           environmentType: EnvironmentType.simulator,
         ),
         fileSystem.path
-            .join(xcframeworkPath, 'ios-x86_64-simulator', 'Flutter.framework'),
+            .join(xcframeworkPath, 'ios-arm64_x86_64-simulator', 'Flutter.framework'),
       );
       expect(
         artifacts.getArtifactPath(