DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename macOS framework to FlutterMacOS.framework (flutter/engine#7740)

Browse Source 
Avoids potential confusion due to the iOS framework already being called
Flutter.framework.
This commit is contained in:
stuartmorgan 2019-02-08 12:00:17 -08:00 committed by GitHub
parent 34bfbdf99f
commit 4c7fa286f3
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/ci/licenses_golden/licenses_flutter
View File

@ -588,7 +588,7 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FLEPluginRe
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FLEReshapeListener.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FLEView.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FLEViewController.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/Flutter.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Info.plist
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FLETextInputModel.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FLETextInputModel.mm

16
engine/src/flutter/shell/platform/darwin/macos/BUILD.gn
View File

@ -8,14 +8,14 @@ import("//build/config/mac/mac_sdk.gni")
import("$flutter_root/common/config.gni")
import("$flutter_root/shell/platform/darwin/framework_shared.gni")
_flutter_framework_name = "Flutter"
_flutter_framework_out_dir_subpath = "macos/$_flutter_framework_name.framework"
_flutter_framework_dir = "$root_out_dir/$_flutter_framework_out_dir_subpath"
_flutter_framework_name = "FlutterMacOS"
_flutter_framework_filename = "$_flutter_framework_name.framework"
_flutter_framework_dir = "$root_out_dir/$_flutter_framework_filename"
# The headers that will be copied to the Flutter.framework and be accessed
# from outside the Flutter engine source root.
# The headers that will be copied to the framework and be accessed from outside
# the Flutter engine source root.
_flutter_framework_headers = [
"framework/Headers/Flutter.h",
"framework/Headers/FlutterMacOS.h",
"framework/Headers/FLEOpenGLContextHandling.h",
"framework/Headers/FLEPlugin.h",
"framework/Headers/FLEPluginRegistrar.h",
@ -89,7 +89,7 @@ action("copy_dylib_and_update_framework_install_name") {
"--dylib",
rebase_path("$_flutter_framework_dir/Versions/A/$_flutter_framework_name"),
"--install_name",
"@rpath/$_flutter_framework_name.framework/Versions/A/$_flutter_framework_name",
"@rpath/$_flutter_framework_filename/Versions/A/$_flutter_framework_name",
"--stamp",
rebase_path(stamp_file),
]
@ -168,7 +168,7 @@ action("_generate_symlinks") {
]
args = [
"--framework",
"$_flutter_framework_out_dir_subpath",
"$_flutter_framework_filename",
"--version",
"A",
"--contents",

0
engine/src/flutter/shell/platform/darwin/macos/framework/Headers/Flutter.h → engine/src/flutter/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
View File

6
engine/src/flutter/shell/platform/darwin/macos/framework/Info.plist
View File

@ -5,13 +5,13 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>Flutter</string>
<string>FlutterMacOS</string>
<key>CFBundleIdentifier</key>
<string>io.flutter.flutter</string>
<string>io.flutter.flutter-macos</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Flutter</string>
<string>FlutterMacOS</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>

4
engine/src/flutter/shell/platform/darwin/macos/framework/module.modulemap
View File

@ -1,5 +1,5 @@
framework module Flutter {
umbrella header "Flutter.h"
framework module FlutterMacOS {
umbrella header "FlutterMacOS.h"
export *
module * { export * }