Clarify which source files are part of Flutter.framework (#2630)

All the headers for Flutter.framework are now in framework/Headers and all the
source files for Flutter.framework are now in framework/Source. Previously it
was unclear that FlutterAppDelegate and main_ios.mm weren't part of
Flutter.framework. (They still build as part of the framework, but that's
something I'll fix in a later patch.)

sky/shell/BUILD.gn

@@ -253,26 +253,26 @@ if (is_android) {
     source_set(target_name) {
 
       sources = [
-        "platform/ios/accessibility_bridge.h",
-        "platform/ios/accessibility_bridge.mm",
         "platform/ios/FlutterAppDelegate.h",
         "platform/ios/FlutterAppDelegate.mm",
-        "platform/ios/FlutterDartProject.mm",
-        "platform/ios/FlutterDartProject_Internal.h",
-        "platform/ios/FlutterDartSource.h",
-        "platform/ios/FlutterDartSource.mm",
-        "platform/ios/FlutterDynamicServiceLoader.h",
-        "platform/ios/FlutterDynamicServiceLoader.mm",
-        "platform/ios/FlutterView.h",
-        "platform/ios/FlutterView.mm",
-        "platform/ios/FlutterViewController.mm",
-        "platform/ios/flutter_touch_mapper.h",
-        "platform/ios/flutter_touch_mapper.mm",
+        "platform/ios/framework/Headers/Flutter.h",
+        "platform/ios/framework/Headers/FlutterDartProject.h",
+        "platform/ios/framework/Headers/FlutterMacros.h",
+        "platform/ios/framework/Headers/FlutterViewController.h",
+        "platform/ios/framework/Source/accessibility_bridge.h",
+        "platform/ios/framework/Source/accessibility_bridge.mm",
+        "platform/ios/framework/Source/FlutterDartProject.mm",
+        "platform/ios/framework/Source/FlutterDartProject_Internal.h",
+        "platform/ios/framework/Source/FlutterDartSource.h",
+        "platform/ios/framework/Source/FlutterDartSource.mm",
+        "platform/ios/framework/Source/FlutterDynamicServiceLoader.h",
+        "platform/ios/framework/Source/FlutterDynamicServiceLoader.mm",
+        "platform/ios/framework/Source/FlutterView.h",
+        "platform/ios/framework/Source/FlutterView.mm",
+        "platform/ios/framework/Source/FlutterViewController.mm",
+        "platform/ios/framework/Source/flutter_touch_mapper.h",
+        "platform/ios/framework/Source/flutter_touch_mapper.mm",
         "platform/ios/main_ios.mm",
-        "platform/ios/public/Flutter.h",
-        "platform/ios/public/FlutterDartProject.h",
-        "platform/ios/public/FlutterMacros.h",
-        "platform/ios/public/FlutterViewController.h",
       ]
 
       set_sources_assignment_filter([])
@@ -381,9 +381,10 @@ if (is_android) {
 
     copy("framework_headers") {
       sources = [
-        "platform/ios/public/Flutter.h",
-        "platform/ios/public/FlutterMacros.h",
-        "platform/ios/public/FlutterViewController.h",
+        "platform/ios/framework/Headers/Flutter.h",
+        "platform/ios/framework/Headers/FlutterDartProject.h",
+        "platform/ios/framework/Headers/FlutterMacros.h",
+        "platform/ios/framework/Headers/FlutterViewController.h",
       ]
       outputs = [ "$framework_dir/Headers/{{source_file_part}}" ]
     }

sky/shell/platform/ios/FlutterAppDelegate.mm

@@ -5,7 +5,7 @@
 #include "base/command_line.h"
 #include "base/trace_event/trace_event.h"
 #include "sky/shell/platform/ios/FlutterAppDelegate.h"
-#include "sky/shell/platform/ios/public/FlutterViewController.h"
+#include "sky/shell/platform/ios/framework/Headers/FlutterViewController.h"
 #include "sky/shell/switches.h"
 
 NSURL* URLForSwitch(const char* name) {

sky/shell/platform/ios/FlutterDartProject.mm → sky/shell/platform/ios/framework/Source/FlutterDartProject.mm

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/platform/ios/FlutterDartProject_Internal.h"
-#include "sky/shell/platform/ios/FlutterDartSource.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterDartSource.h"
 
 @implementation FlutterDartProject {
   NSBundle* _precompiledDartBundle;

sky/shell/platform/ios/FlutterDartProject_Internal.h → sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h

@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/platform/ios/public/FlutterDartProject.h"
+#ifndef SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+
+#include "sky/shell/platform/ios/framework/Headers/FlutterDartProject.h"
 
 #include "sky/services/engine/sky_engine.mojom.h"
 
@@ -24,3 +27,5 @@ typedef void (^LaunchResult)(BOOL success, NSString* message);
                 result:(LaunchResult)result;
 
 @end
+
+#endif  // SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_

sky/shell/platform/ios/FlutterDartSource.h → sky/shell/platform/ios/framework/Source/FlutterDartSource.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_PLATFORM_IOS_FLUTTERDARTSOURCE_H_
-#define SKY_SHELL_PLATFORM_IOS_FLUTTERDARTSOURCE_H_
+#ifndef SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTSOURCE_H_
+#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTSOURCE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -23,4 +23,4 @@ typedef void (^ValidationResult)(BOOL result, NSString* message);
 
 @end
 
-#endif  // SKY_SHELL_PLATFORM_IOS_FLUTTERDARTSOURCE_H_
+#endif  // SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTSOURCE_H_

sky/shell/platform/ios/FlutterDartSource.mm → sky/shell/platform/ios/framework/Source/FlutterDartSource.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 "sky/shell/platform/ios/FlutterDartSource.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterDartSource.h"
 
 @implementation FlutterDartSource {
   NSURL* _dartMain;

sky/shell/platform/ios/FlutterDynamicServiceLoader.h → sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_PLATFORM_IOS_SKY_DYNAMIC_SERVICE_LOADER_H_
-#define SKY_SHELL_PLATFORM_IOS_SKY_DYNAMIC_SERVICE_LOADER_H_
+#ifndef SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_DYNAMIC_SERVICE_LOADER_H_
+#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_DYNAMIC_SERVICE_LOADER_H_
 
 #import <Foundation/Foundation.h>
 #include "sky/shell/platform/mac/platform_service_provider.h"
@@ -15,4 +15,4 @@
 
 @end
 
-#endif  // SKY_SHELL_PLATFORM_IOS_SKY_DYNAMIC_SERVICE_LOADER_H_
+#endif  // SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_DYNAMIC_SERVICE_LOADER_H_

sky/shell/platform/ios/FlutterDynamicServiceLoader.mm → sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.mm

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/platform/ios/FlutterDynamicServiceLoader.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h"
+
 #include "sky/services/dynamic/dynamic_service_embedder.h"
 #include "sky/services/dynamic/dynamic_service_definition.h"
 #include <Foundation/Foundation.h>

sky/shell/platform/ios/FlutterView.h → sky/shell/platform/ios/framework/Source/FlutterView.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERVIEW_H_
-#define FLUTTER_FLUTTERVIEW_H_
+#ifndef SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_
+#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_
 
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 
@@ -15,4 +15,4 @@
 
 @end
 
-#endif  // FLUTTER_FLUTTERVIEW_H_
+#endif  // SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_

sky/shell/platform/ios/FlutterView.mm → sky/shell/platform/ios/framework/Source/FlutterView.mm

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "sky/shell/platform/ios/framework/Source/FlutterView.h"
+
 #include "base/memory/weak_ptr.h"
-#include "sky/shell/platform/ios/accessibility_bridge.h"
-#include "sky/shell/platform/ios/FlutterView.h"
+#include "sky/shell/platform/ios/framework/Source/accessibility_bridge.h"
 
 @interface FlutterView ()<UIInputViewAudioFeedback>
 

sky/shell/platform/ios/FlutterViewController.mm → sky/shell/platform/ios/framework/Source/FlutterViewController.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.
 
-#import "sky/shell/platform/ios/public/FlutterViewController.h"
+#import "sky/shell/platform/ios/framework/Headers/FlutterViewController.h"
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/trace_event/trace_event.h"
@@ -11,10 +11,10 @@
 #include "sky/services/engine/sky_engine.mojom.h"
 #include "sky/services/platform/ios/system_chrome_impl.h"
 #include "sky/services/semantics/semantics.mojom.h"
-#include "sky/shell/platform/ios/flutter_touch_mapper.h"
-#include "sky/shell/platform/ios/FlutterDartProject_Internal.h"
-#include "sky/shell/platform/ios/FlutterDynamicServiceLoader.h"
-#include "sky/shell/platform/ios/FlutterView.h"
+#include "sky/shell/platform/ios/framework/Source/flutter_touch_mapper.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterView.h"
 #include "sky/shell/platform/mac/platform_mac.h"
 #include "sky/shell/platform/mac/platform_view_mac.h"
 #include "sky/shell/platform/mac/platform_service_provider.h"

sky/shell/platform/ios/accessibility_bridge.h → sky/shell/platform/ios/framework/Source/accessibility_bridge.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_PLATFORM_IOS_ACCESSIBILITY_BRIDGE_H_
-#define SKY_SHELL_PLATFORM_IOS_ACCESSIBILITY_BRIDGE_H_
+#ifndef SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
+#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
 
 #include <map>
 #include <memory>
@@ -18,7 +18,7 @@
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "sky/engine/platform/geometry/FloatRect.h"
 #include "sky/services/semantics/semantics.mojom.h"
-#include "sky/shell/platform/ios/FlutterView.h"
+#include "sky/shell/platform/ios/framework/Source/FlutterView.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 
@@ -64,4 +64,4 @@ class AccessibilityBridge final : public semantics::SemanticsListener {
 }  // namespace shell
 }  // namespace sky
 
-#endif  // SKY_SHELL_PLATFORM_IOS_ACCESSIBILITY_BRIDGE_H_
+#endif  // SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_

sky/shell/platform/ios/accessibility_bridge.mm → sky/shell/platform/ios/framework/Source/accessibility_bridge.mm

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/cpp/application/connect.h"
-#include "sky/shell/platform/ios/accessibility_bridge.h"
+#include "sky/shell/platform/ios/framework/Source/accessibility_bridge.h"
 
 #include <UIKit/UIKit.h>
 
+#include "mojo/public/cpp/application/connect.h"
+
 namespace sky {
 namespace shell {
 

sky/shell/platform/ios/flutter_touch_mapper.h → sky/shell/platform/ios/framework/Source/flutter_touch_mapper.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_PLATFORM_IOS_TOUCH_MAPPER_H_
-#define SKY_SHELL_PLATFORM_IOS_TOUCH_MAPPER_H_
+#ifndef SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_TOUCH_MAPPER_H_
+#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_TOUCH_MAPPER_H_
 
 #include <UIKit/UIKit.h>
 
@@ -39,4 +39,4 @@ class TouchMapper {
 }  // namespace shell
 }  // namespace sky
 
-#endif  // SKY_SHELL_PLATFORM_IOS_TOUCH_MAPPER_H_
+#endif  // SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_TOUCH_MAPPER_H_

sky/shell/platform/ios/flutter_touch_mapper.mm → sky/shell/platform/ios/framework/Source/flutter_touch_mapper.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 "sky/shell/platform/ios/flutter_touch_mapper.h"
+#include "sky/shell/platform/ios/framework/Source/flutter_touch_mapper.h"
 
 namespace sky {
 namespace shell {