Avoid thinning frameworks in iOS extensions #64674

jmagman · 2020-08-26T22:44:33Z

Description

Watch extensions are embedded in iOS apps. Avoid lipo'ing those frameworks to iOS architectures. Stick to the app frameworks.

Related Issues

Fixes #60351

Tests

Updated ios_app_with_extensions_test to include a watch framework. Check the build succeeds, and that the watch extension frameworks have the expected watch architectures.

Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I signed the [CLA].
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I updated/added relevant documentation (doc comments with ///).
All existing and new tests are passing.
The analyzer (flutter analyze --flutter-repo) does not report any problems on my PR.
I am willing to follow-up on review comments in a timely manner.

Breaking Change

No, no existing tests failed, so this is not a breaking change.
Yes, this is a breaking change. If not, delete the remainder of this section.

jmagman · 2020-08-26T22:45:15Z

dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart

+        'EFQRCode.framework',
+        'EFQRCode',
+      );
+      _checkWatchExtensionFrameworkArchs(watchExtensionFrameworkPath);


This is the new check that these plugin frameworks haven't been lipod to the iOS ARCHS.

jmagman · 2020-08-26T22:46:24Z

dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart

@@ -160,34 +191,6 @@ Future<void> main() async {
        workingDirectory: flutterDirectory.path,
      );

-      await inDirectory(projectDir, () async {


This wasn't actually building for the simulator (it's missing --simulator) even with the -d flag. flutter build ios with a watch companion doesn't actually work. Anyway the next thing this does is run on the simulator, which does work.

jmagman · 2020-08-26T22:47:44Z

dev/integration_tests/ios_app_with_extensions/ios/Podfile

+  use_frameworks!
+  use_modular_headers!
+
+  pod 'EFQRCode/watchOS', '5.1.6'


This adds a framework to the watch extension. Previous this failed because xcode_backend lipod all .frameworks, even the ones in the watch extension with a different expected architecture.

jmagman · 2020-08-26T22:48:12Z

dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.pbxproj

@@ -811,7 +946,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;


Bitcode should be off for Runner.

Why should bitcode be off? Bitcode is a requirement when you have a watch extension.

Because this is an integration test that will never be submitted to the App Store and I didn't want to track down issues related to the pods building before the correct bitcode-embedded version of Flutter gets copied around. I'll set it back to YES and see if this particular integration test triggers that case.

jmagman · 2020-08-26T22:48:43Z

dev/integration_tests/ios_app_with_extensions/pubspec.yaml

@@ -19,9 +19,13 @@ dependencies:
  flutter:
    sdk: flutter

+  device_info: 0.4.2+7


Adding (any) plugin is what kicks the tool into running pod install, which we need to embed the watch framework.

jmagman · 2020-08-26T22:49:52Z

packages/flutter_tools/bin/xcode_backend.sh

@@ -257,11 +257,10 @@ ThinFramework() {
 }

 ThinAppFrameworks() {
-  local app_path="${TARGET_BUILD_DIR}/${WRAPPER_NAME}"
-  local frameworks_dir="${app_path}/Frameworks"
+  local xcode_frameworks_dir="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"


This is the actual fix.
Instead of finding and thinning all *.frameworks in Runner.app, it now only does so in the Runner.app/Frameworks directory.

xster

LGTM

xster · 2020-08-27T05:44:02Z

dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart

+        'watch Extension.appex',
+        'Frameworks',
+        'EFQRCode.framework',
+        'EFQRCode',


Add a comment for what this is? It came from a pod?

xster · 2020-08-27T05:46:38Z

dev/integration_tests/ios_app_with_extensions/ios/Podfile

+  use_frameworks!
+  use_modular_headers!
+
+  pod 'EFQRCode/watchOS', '5.1.6'


never mind, the answer's here. Still good to comment in the other file.

fluttergithubbot · 2020-08-28T01:03:02Z

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

Please get at least one approved review before re-applying this label. Reviewers: If you left a comment approving, please use the "approve" review action instead.

jmagman · 2020-08-28T01:10:39Z

LGTM

@xster would you mind approving it?

xster · 2020-08-28T05:18:56Z

GitHub needs an approve button on the main tab instead of the files tab.

zanderso · 2020-08-28T22:18:27Z

It looks like this might have broken ios_app_with_extensions_test in the device lab.

This reverts commit ce9cde8.

jmagman · 2020-08-28T22:23:46Z

Error:

 could not find included file 'Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig' in search paths (in target 'Runner' from project 'Runner')error: /var/folders/gr/7pczn0h51nz2qb3t_0xyfhqc0000gn/T/ios_app_with_extensions_testUdVJD4/app_with_extensions/ios/Flutter/Release.xcconfig

…lutter#64829) This reverts commit ce9cde8.

jmagman added the platform-ios iOS applications specifically label Aug 26, 2020

jmagman self-assigned this Aug 26, 2020

flutter-dashboard bot added c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Aug 26, 2020

googlebot added the cla: yes label Aug 26, 2020

jmagman commented Aug 26, 2020

View reviewed changes

jmagman requested review from christopherfujino and xster August 26, 2020 22:50

jmagman force-pushed the lipo-dir branch from 6b26d9f to 486ba8b Compare August 26, 2020 22:50

xster reviewed Aug 27, 2020

View reviewed changes

jmagman added 2 commits August 27, 2020 10:08

Avoid thinning frameworks in iOS extensions

b762d75

Remove device_info, reset bitcode

ba32390

jmagman force-pushed the lipo-dir branch from 486ba8b to ba32390 Compare August 27, 2020 17:09

jmagman added the waiting for tree to go green label Aug 28, 2020

fluttergithubbot removed the waiting for tree to go green label Aug 28, 2020

xster approved these changes Aug 28, 2020

View reviewed changes

jmagman added the waiting for tree to go green label Aug 28, 2020

fluttergithubbot merged commit ce9cde8 into flutter:master Aug 28, 2020

jmagman deleted the lipo-dir branch August 28, 2020 17:54

zanderso added a commit that referenced this pull request Aug 28, 2020

Revert "Avoid thinning frameworks in iOS extensions (#64674)"

8b791c0

This reverts commit ce9cde8.

zanderso mentioned this pull request Aug 28, 2020

Revert "Avoid thinning frameworks in iOS extensions" #64829

Merged

zanderso added a commit that referenced this pull request Aug 28, 2020

Revert "Avoid thinning frameworks in iOS extensions (#64674)" (#64829)

dff7ea1

This reverts commit ce9cde8.

jmagman mentioned this pull request Sep 3, 2020

Avoid thinning frameworks in iOS extensions #65198

Merged

10 tasks

mingwandroid pushed a commit to mingwandroid/flutter that referenced this pull request Sep 6, 2020

Avoid thinning frameworks in iOS extensions (flutter#64674)

8f21bd9

mingwandroid pushed a commit to mingwandroid/flutter that referenced this pull request Sep 6, 2020

Revert "Avoid thinning frameworks in iOS extensions (flutter#64674)" (f…

8ba6883

…lutter#64829) This reverts commit ce9cde8.

jmagman added a commit to jmagman/flutter that referenced this pull request Sep 15, 2020

Avoid thinning frameworks in iOS extensions (flutter#64674)

b7e910f

github-actions bot locked as resolved and limited conversation to collaborators Aug 28, 2021

Avoid thinning frameworks in iOS extensions #64674

Avoid thinning frameworks in iOS extensions #64674

Uh oh!

Conversation

jmagman commented Aug 26, 2020

Description

Related Issues

Tests

Checklist

Breaking Change

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xster left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fluttergithubbot commented Aug 28, 2020

Uh oh!

jmagman commented Aug 28, 2020

Uh oh!

xster commented Aug 28, 2020

Uh oh!

zanderso commented Aug 28, 2020

Uh oh!

jmagman commented Aug 28, 2020

Uh oh!

Uh oh!