Skip to content

Commit 6e5a530

Browse files
authored
Add flags to make App.framework work in app extension (flutter#123618)
Add flags to make App.framework work in app extension
1 parent f2fb1b5 commit 6e5a530

File tree

7 files changed

+11
-0
lines changed

7 files changed

+11
-0
lines changed

packages/flutter_tools/lib/src/base/build.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ class AOTSnapshotter {
300300
'-dynamiclib',
301301
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
302302
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks',
303+
'-fapplication-extension',
303304
'-install_name', '@rpath/App.framework/App',
304305
'-o', appLib,
305306
assemblyO,

packages/flutter_tools/lib/src/build_system/targets/ios.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ Future<void> _createStubAppFramework(File outputFile, Environment environment,
677677
'-miphonesimulator-version-min=11.0',
678678
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
679679
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks',
680+
'-fapplication-extension',
680681
'-install_name', '@rpath/App.framework/App',
681682
'-isysroot', sdkRoot,
682683
'-o', outputFile.path,

packages/flutter_tools/lib/src/build_system/targets/macos.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ static const int Moo = 88;
206206
'-dynamiclib',
207207
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
208208
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks',
209+
'-fapplication-extension',
209210
'-install_name', '@rpath/App.framework/App',
210211
'-o', outputFile.path,
211212
]);

packages/flutter_tools/test/general.shard/base/build_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const List<String> kDefaultClang = <String>[
4040
'-rpath',
4141
'-Xlinker',
4242
'@loader_path/Frameworks',
43+
'-fapplication-extension',
4344
'-install_name',
4445
'@rpath/App.framework/App',
4546
'-o',

packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ void main() {
511511
'-rpath',
512512
'-Xlinker',
513513
'@loader_path/Frameworks',
514+
'-fapplication-extension',
514515
'-install_name',
515516
'@rpath/App.framework/App',
516517
'-o',

packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const List<String> _kSharedConfig = <String>[
3131
'-rpath',
3232
'-Xlinker',
3333
'@loader_path/Frameworks',
34+
'-fapplication-extension',
3435
'-install_name',
3536
'@rpath/App.framework/App',
3637
'-isysroot',
@@ -95,6 +96,7 @@ void main() {
9596
'-rpath',
9697
'-Xlinker',
9798
'@loader_path/Frameworks',
99+
'-fapplication-extension',
98100
'-install_name',
99101
'@rpath/App.framework/App',
100102
'-isysroot',

packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ void main() {
385385
'-dynamiclib',
386386
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
387387
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks',
388+
'-fapplication-extension',
388389
'-install_name', '@rpath/App.framework/App',
389390
'-o',
390391
environment.buildDir
@@ -417,6 +418,7 @@ void main() {
417418
'-dynamiclib',
418419
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
419420
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks',
421+
'-fapplication-extension',
420422
'-install_name', '@rpath/App.framework/App',
421423
'-o',
422424
environment.buildDir
@@ -474,6 +476,7 @@ void main() {
474476
'xcrun', 'clang', '-arch', 'arm64', '-dynamiclib', '-Xlinker', '-rpath',
475477
'-Xlinker', '@executable_path/Frameworks', '-Xlinker', '-rpath',
476478
'-Xlinker', '@loader_path/Frameworks',
479+
'-fapplication-extension',
477480
'-install_name', '@rpath/App.framework/App',
478481
'-o', environment.buildDir.childFile('arm64/App.framework/App').path,
479482
environment.buildDir.childFile('arm64/snapshot_assembly.o').path,
@@ -482,6 +485,7 @@ void main() {
482485
'xcrun', 'clang', '-arch', 'x86_64', '-dynamiclib', '-Xlinker', '-rpath',
483486
'-Xlinker', '@executable_path/Frameworks', '-Xlinker', '-rpath',
484487
'-Xlinker', '@loader_path/Frameworks',
488+
'-fapplication-extension',
485489
'-install_name', '@rpath/App.framework/App',
486490
'-o', environment.buildDir.childFile('x86_64/App.framework/App').path,
487491
environment.buildDir.childFile('x86_64/snapshot_assembly.o').path,

0 commit comments

Comments
 (0)