From 4c7fa286f3eaa9f71d136af838dbdc527af49b1e Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuart.morgan@gmail.com>
Date: Fri, 8 Feb 2019 12:00:17 -0800
Subject: [PATCH] Rename macOS framework to FlutterMacOS.framework
 (flutter/engine#7740)

Avoids potential confusion due to the iOS framework already being called
Flutter.framework.
---
 .../flutter/ci/licenses_golden/licenses_flutter  |  2 +-
 .../flutter/shell/platform/darwin/macos/BUILD.gn | 16 ++++++++--------
 .../Headers/{Flutter.h => FlutterMacOS.h}        |  0
 .../platform/darwin/macos/framework/Info.plist   |  6 +++---
 .../darwin/macos/framework/module.modulemap      |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename engine/src/flutter/shell/platform/darwin/macos/framework/Headers/{Flutter.h => FlutterMacOS.h} (100%)

diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter
index 8a0bf83a6b2..d9ed2700a37 100644
--- a/engine/src/flutter/ci/licenses_golden/licenses_flutter
+++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter
@@ -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
diff --git a/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn b/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn
index 29fcb9f1f1f..87c055bbdae 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn
+++ b/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn
@@ -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",
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Headers/Flutter.h b/engine/src/flutter/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
similarity index 100%
rename from engine/src/flutter/shell/platform/darwin/macos/framework/Headers/Flutter.h
rename to engine/src/flutter/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Info.plist b/engine/src/flutter/shell/platform/darwin/macos/framework/Info.plist
index a4f200a1904..044a5e31b7e 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Info.plist
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Info.plist
@@ -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>
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/module.modulemap b/engine/src/flutter/shell/platform/darwin/macos/framework/module.modulemap
index bf81c8a8651..3e70a88b7c2 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/module.modulemap
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/module.modulemap
@@ -1,5 +1,5 @@
-framework module Flutter {
-  umbrella header "Flutter.h"
+framework module FlutterMacOS {
+  umbrella header "FlutterMacOS.h"
 
   export *
   module * { export * }