Respect plugin excluded iOS architectures #86905
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jmagman
commented
Jul 22, 2021
Comment on lines
+180
to
+182
| if (!podsProjectContent.contains(r'"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited) i386";')) { | ||
| throw TaskResult.failure(r'EXCLUDED_ARCHS is not "$(inherited) i386"'); | ||
| } |
There was a problem hiding this comment.
This is the new check, the rest is whitespace from hoisting out the target == 'ios' check.
| @@ -243,6 +243,7 @@ void main() { | |||
| <String>['file', simulatorAppFrameworkBinary.path], | |||
| ); | |||
| expect(archs.stdout, contains('Mach-O 64-bit dynamically linked shared library x86_64')); | |||
| expect(archs.stdout, contains('Mach-O 64-bit dynamically linked shared library arm64')); | |||
There was a problem hiding this comment.
This isn't actually related to this change, but this case should have been added with #85642
stuartmorgan-g
approved these changes
Jul 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Respect plugin Xcode build setting for
EXCLUDED_ARCHSinstead of overriding it.Suggested in #85713 (comment)