Move channel and codec related files to common (#4225)

* Move channel and codec related files to common

This is in preparation for implementing channel and plugin support
for macOS desktop builds.

shell/platform/darwin/BUILD.gn

@@ -28,13 +28,13 @@ source_set("flutter_channels") {
   sources = [
     "common/buffer_conversions.h",
     "common/buffer_conversions.mm",
-    "ios/framework/Headers/FlutterBinaryMessenger.h",
-    "ios/framework/Headers/FlutterChannels.h",
-    "ios/framework/Headers/FlutterCodecs.h",
-    "ios/framework/Source/FlutterChannels.mm",
-    "ios/framework/Source/FlutterCodecs.mm",
-    "ios/framework/Source/FlutterStandardCodec.mm",
-    "ios/framework/Source/FlutterStandardCodec_Internal.h",
+    "common/FlutterBinaryMessenger.h",
+    "common/FlutterChannels.h",
+    "common/FlutterCodecs.h",
+    "common/FlutterChannels.mm",
+    "common/FlutterCodecs.mm",
+    "common/FlutterStandardCodec.mm",
+    "common/FlutterStandardCodec_Internal.h",
   ]
   set_sources_assignment_filter(sources_assignment_filter)
 
@@ -61,8 +61,8 @@ executable("flutter_channels_unittests") {
 
   set_sources_assignment_filter([])
   sources = [
-    "ios/framework/Source/flutter_codecs_unittest.mm",
-    "ios/framework/Source/flutter_standard_codec_unittest.mm",
+    "common/flutter_codecs_unittest.mm",
+    "common/flutter_standard_codec_unittest.mm",
   ]
   set_sources_assignment_filter(sources_assignment_filter)
 

shell/platform/darwin/common/BUILD.gn

@@ -9,6 +9,12 @@ source_set("common") {
   sources = [
     "buffer_conversions.h",
     "buffer_conversions.mm",
+    "FlutterChannels.h",
+    "FlutterChannels.mm",
+    "FlutterCodecs.h",
+    "FlutterCodecs.mm",
+    "FlutterStandardCodec.mm",
+    "FlutterStandardCodec_internal.h",
     "platform_mac.h",
     "platform_mac.mm",
     "process_info_mac.cc",

shell/platform/darwin/ios/framework/Source/FlutterChannels.mm → shell/platform/darwin/common/FlutterChannels.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterChannels.h"
+#include "flutter/shell/platform/darwin/common/FlutterChannels.h"
 
 #pragma mark - Basic message channel
 

shell/platform/darwin/ios/framework/Source/FlutterCodecs.mm → shell/platform/darwin/common/FlutterCodecs.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/common/FlutterCodecs.h"
 
 @implementation FlutterBinaryCodec
 + (instancetype)sharedInstance {

shell/platform/darwin/ios/framework/Source/FlutterStandardCodec_Internal.h → shell/platform/darwin/common/FlutterStandardCodec_Internal.h

@@ -5,7 +5,7 @@
 #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_
 #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/common/FlutterCodecs.h"
 
 typedef NS_ENUM(NSInteger, FlutterStandardField) {
   FlutterStandardFieldNil,

shell/platform/darwin/ios/framework/Source/flutter_codecs_unittest.mm → shell/platform/darwin/common/flutter_codecs_unittest.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/common/FlutterCodecs.h"
 #include "gtest/gtest.h"
 
 TEST(FlutterStringCodec, CanEncodeAndDecodeNil) {

shell/platform/darwin/ios/framework/Source/flutter_standard_codec_unittest.mm → shell/platform/darwin/common/flutter_standard_codec_unittest.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/common/FlutterCodecs.h"
 #include "gtest/gtest.h"
 
 void checkEncodeDecode(id value, NSData* expectedEncoding) {

shell/platform/darwin/ios/BUILD.gn

@@ -26,16 +26,12 @@ shared_library("flutter_framework_dylib") {
     "framework/Headers/FlutterViewController.h",
     "framework/Headers/FlutterNavigationController.h",
     "framework/Source/FlutterAppDelegate.mm",
-    "framework/Source/FlutterChannels.mm",
-    "framework/Source/FlutterCodecs.mm",
     "framework/Source/FlutterDartProject.mm",
     "framework/Source/FlutterDartProject_Internal.h",
     "framework/Source/FlutterDartSource.h",
     "framework/Source/FlutterDartSource.mm",
     "framework/Source/FlutterPlatformPlugin.h",
     "framework/Source/FlutterPlatformPlugin.mm",
-    "framework/Source/FlutterStandardCodec.mm",
-    "framework/Source/FlutterStandardCodec_Internal.h",
     "framework/Source/FlutterTextInputDelegate.h",
     "framework/Source/FlutterTextInputPlugin.h",
     "framework/Source/FlutterTextInputPlugin.mm",

travis/licenses_golden/licenses_flutter

@@ -1162,20 +1162,20 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/util/Preconditions.java
 FILE: ../../../flutter/shell/platform/android/platform_view_android_jni.cc
 FILE: ../../../flutter/shell/platform/android/platform_view_android_jni.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterBinaryMessenger.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterChannels.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterBinaryMessenger.h
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterChannels.h
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterChannels.mm
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterCodecs.h
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterCodecs.mm
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterStandardCodec.mm
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterStandardCodec_Internal.h
+FILE: ../../../flutter/shell/platform/darwin/common/flutter_codecs_unittest.mm
+FILE: ../../../flutter/shell/platform/darwin/common/flutter_standard_codec_unittest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterNavigationController.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterChannels.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterCodecs.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterNavigationController.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterStandardCodec.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterStandardCodec_Internal.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/flutter_codecs_unittest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/flutter_main_ios.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/flutter_main_ios.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/flutter_standard_codec_unittest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_context.h
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_context.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface.h
@@ -1427,6 +1427,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/Platfor
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.cc
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.h
+FILE: ../../../flutter/shell/platform/darwin/common/FlutterMacros.h
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm
 FILE: ../../../flutter/shell/platform/darwin/common/process_info_mac.cc
 FILE: ../../../flutter/shell/platform/darwin/common/process_info_mac.h
@@ -1434,7 +1435,6 @@ FILE: ../../../flutter/shell/platform/darwin/desktop/vsync_waiter_mac.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterMacros.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h