Skip to content

Check ios-arm64_armv7 directory when validating codesigning entitlements#85053

Merged
fluttergithubbot merged 1 commit intoflutter:masterfrom
jmagman:codesign
Jun 23, 2021
Merged

Check ios-arm64_armv7 directory when validating codesigning entitlements#85053
fluttergithubbot merged 1 commit intoflutter:masterfrom
jmagman:codesign

Conversation

@jmagman
Copy link
Member

@jmagman jmagman commented Jun 22, 2021

The engine builder was updated from Xcode 11 to Xcode 12 in https://github.com/flutter/infra/pull/473. Xcode 11 generated xcframeworks as ios_armv7_arm64 but Xcode 12 switched the order to ios-arm64_armv7.

Update the codesign script to check for Xcode 12 naming. Will be needed for the next release after the first engine roll built with Xcode 12 #85052.

A similar change made awhile ago:

// Xcode changed the name of this generated directory in Xcode 12.
const String xcode11ArmDirectoryName = 'ios-armv7_arm64';
const String xcode12ArmDirectoryName = 'ios-arm64_armv7';

@jmagman jmagman added c: contributor-productivity Team-specific productivity, code health, technical debt. platform-ios iOS applications specifically labels Jun 22, 2021
@jmagman jmagman self-assigned this Jun 22, 2021
@flutter-dashboard flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jun 22, 2021
@google-cla google-cla bot added the cla: yes label Jun 22, 2021
fileSystem
.directory(xcframeworkPath)
.childDirectory('ios-armv7_arm64')
.childDirectory('ios-arm64_armv7')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes to this file aren't strictly related to the codesign issue, but may as well change them together.

Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fluttergithubbot
Copy link
Contributor

This pull request is not suitable for automatic merging in its current state.

  • The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt. platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants