Revert "Move channel and codec related files to common (#4262)" (#4277)

This reverts commit a48b5f6d.

shell/platform/darwin/BUILD.gn

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

shell/platform/darwin/common/BUILD.gn

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

shell/platform/darwin/ios/BUILD.gn

@@ -17,17 +17,25 @@ shared_library("flutter_framework_dylib") {
   sources = [
     "framework/Headers/Flutter.h",
     "framework/Headers/FlutterAppDelegate.h",
+    "framework/Headers/FlutterBinaryMessenger.h",
+    "framework/Headers/FlutterChannels.h",
+    "framework/Headers/FlutterCodecs.h",
     "framework/Headers/FlutterDartProject.h",
+    "framework/Headers/FlutterMacros.h",
     "framework/Headers/FlutterPlugin.h",
     "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",
@@ -156,7 +164,11 @@ copy("framework_headers") {
   sources = [
     "framework/Headers/Flutter.h",
     "framework/Headers/FlutterAppDelegate.h",
+    "framework/Headers/FlutterBinaryMessenger.h",
+    "framework/Headers/FlutterChannels.h",
+    "framework/Headers/FlutterCodecs.h",
     "framework/Headers/FlutterDartProject.h",
+    "framework/Headers/FlutterMacros.h",
     "framework/Headers/FlutterPlugin.h",
     "framework/Headers/FlutterViewController.h",
     "framework/Headers/FlutterNavigationController.h",
@@ -164,10 +176,6 @@ copy("framework_headers") {
   outputs = [
     "$_flutter_framework_dir/Headers/{{source_file_part}}",
   ]
-
-  deps = [
-    "$flutter_root/shell/platform/darwin/common",
-  ]
 }
 
 copy("framework_icu") {

shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h

@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#include "FlutterMacros.h"
 #include "FlutterPlugin.h"
-#include "flutter/shell/platform/darwin/common/FlutterMacros.h"
 
 /**
  * UIApplicationDelegate subclass for simple apps that want default behavior.

shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "flutter/shell/platform/darwin/common/FlutterMacros.h"
+#include "FlutterMacros.h"
 
 FLUTTER_EXPORT
 @interface FlutterDartProject : NSObject

shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h

@@ -7,9 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
-#include "flutter/shell/platform/darwin/common/FlutterBinaryMessenger.h"
-#include "flutter/shell/platform/darwin/common/FlutterChannels.h"
-#include "flutter/shell/platform/darwin/common/FlutterCodecs.h"
+#include "FlutterBinaryMessenger.h"
+#include "FlutterChannels.h"
+#include "FlutterCodecs.h"
 
 NS_ASSUME_NONNULL_BEGIN
 @protocol FlutterPluginRegistrar;

shell/platform/darwin/ios/framework/Headers/FlutterViewController.h

@@ -8,9 +8,9 @@
 #import <UIKit/UIKit.h>
 #include <sys/cdefs.h>
 
+#include "FlutterBinaryMessenger.h"
 #include "FlutterDartProject.h"
-#include "flutter/shell/platform/darwin/common/FlutterBinaryMessenger.h"
-#include "flutter/shell/platform/darwin/common/FlutterMacros.h"
+#include "FlutterMacros.h"
 
 FLUTTER_EXPORT
 @interface FlutterViewController : UIViewController<FlutterBinaryMessenger>

shell/platform/darwin/common/FlutterChannels.mm → shell/platform/darwin/ios/framework/Source/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/common/FlutterChannels.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterChannels.h"
 
 #pragma mark - Basic message channel
 

shell/platform/darwin/common/FlutterCodecs.mm → shell/platform/darwin/ios/framework/Source/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/common/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
 
 @implementation FlutterBinaryCodec
 + (instancetype)sharedInstance {

shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h

@@ -5,7 +5,7 @@
 #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
 #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
 
-#include "flutter/shell/platform/darwin/common/FlutterChannels.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterChannels.h"
 
 @interface FlutterPlatformPlugin : NSObject
 

shell/platform/darwin/common/FlutterStandardCodec_Internal.h → shell/platform/darwin/ios/framework/Source/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/common/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
 
 typedef NS_ENUM(NSInteger, FlutterStandardField) {
   FlutterStandardFieldNil,

shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h

@@ -5,7 +5,7 @@
 #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
 #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
 
-#include "flutter/shell/platform/darwin/common/FlutterChannels.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterChannels.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
 
 @interface FlutterTextInputPlugin : NSObject

shell/platform/darwin/ios/framework/Source/FlutterViewController.mm

@@ -10,9 +10,9 @@
 #include "flutter/fml/platform/darwin/platform_version.h"
 #include "flutter/fml/platform/darwin/scoped_block.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/shell/platform/darwin/common/FlutterCodecs.h"
 #include "flutter/shell/platform/darwin/common/buffer_conversions.h"
 #include "flutter/shell/platform/darwin/common/platform_mac.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"

shell/platform/darwin/ios/framework/Source/accessibility_bridge.h

@@ -12,7 +12,7 @@
 
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/lib/ui/semantics/semantics_node.h"
-#include "flutter/shell/platform/darwin/common/FlutterChannels.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterChannels.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
 #include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkMatrix44.h"

shell/platform/darwin/common/flutter_codecs_unittest.mm → shell/platform/darwin/ios/framework/Source/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/common/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
 #include "gtest/gtest.h"
 
 TEST(FlutterStringCodec, CanEncodeAndDecodeNil) {

shell/platform/darwin/common/flutter_standard_codec_unittest.mm → shell/platform/darwin/ios/framework/Source/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/common/FlutterCodecs.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCodecs.h"
 #include "gtest/gtest.h"
 
 void checkEncodeDecode(id value, NSData* expectedEncoding) {

shell/platform/darwin/ios/framework/Source/platform_message_router.h

@@ -8,7 +8,7 @@
 #include <unordered_map>
 
 #include "flutter/lib/ui/window/platform_message.h"
-#include "flutter/shell/platform/darwin/common/FlutterBinaryMessenger.h"
+#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterBinaryMessenger.h"
 #include "lib/fxl/memory/weak_ptr.h"
 
 namespace shell {

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/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/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/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
@@ -1429,7 +1429,6 @@ 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
@@ -1437,6 +1436,7 @@ 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