Update paths to account for buildroot

dattto · Aug 9, 2016 · 9c09565 · 9c09565
1 parent 22f834e
commit 9c09565
Show file tree

Hide file tree

Showing 947 changed files with 2,997 additions and 2,981 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -3,16 +3,16 @@
 # found in the LICENSE file.
 
 # This target will be built if no target is specified when invoking ninja.
-group("default") {
+group("flutter") {
   testonly = true
   deps = [
-    "//sky",
+    "//flutter/sky",
   ]
 
   if (is_ios) {
     deps += [
-      "//sky/services/dynamic:sdk_lib_archive",
-      "//sky/shell:flutter_framework",
+      "//flutter/services/dynamic:sdk_lib_archive",
+      "//flutter/sky/shell:flutter_framework",
     ]
   }
 }
@@ -21,6 +21,6 @@ group("dist") {
   testonly = true
 
   deps = [
-    "//sky/dist",
+    "//flutter/sky/dist",
   ]
 }
diff --git a/DEPS b/DEPS
@@ -43,6 +43,8 @@ allowed_hosts = [
 ]
 
 deps = {
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '9a9f454f5f454c6c01ee3814daa151b0fd49df85',
+
    # Fuchsia compatibility
    #
    # The dependencies in this section should match the layout in the Fuchsia gn

diff --git a/flutter/assets/BUILD.gn → assets/BUILD.gn b/flutter/assets/BUILD.gn → assets/BUILD.gn
@@ -19,7 +19,7 @@ source_set("assets") {
   ]
 
   deps = [
-    "//glue",
+    "//flutter/glue",
     "//lib/ftl",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/system",

diff --git a/flutter/assets/directory_asset_bundle.cc → assets/directory_asset_bundle.cc b/flutter/assets/directory_asset_bundle.cc → assets/directory_asset_bundle.cc
@@ -9,7 +9,7 @@
 
 #include <utility>
 
-#include "glue/data_pipe_utils.h"
+#include "flutter/glue/data_pipe_utils.h"
 #include "lib/ftl/files/eintr_wrapper.h"
 #include "lib/ftl/files/path.h"
 #include "lib/ftl/files/unique_fd.h"

diff --git a/flutter/assets/directory_asset_bundle.h → assets/directory_asset_bundle.h b/flutter/assets/directory_asset_bundle.h → assets/directory_asset_bundle.h
diff --git a/flutter/assets/unique_unzipper.cc → assets/unique_unzipper.cc b/flutter/assets/unique_unzipper.cc → assets/unique_unzipper.cc
diff --git a/flutter/assets/unique_unzipper.h → assets/unique_unzipper.h b/flutter/assets/unique_unzipper.h → assets/unique_unzipper.h
diff --git a/flutter/assets/unzip_job.cc → assets/unzip_job.cc b/flutter/assets/unzip_job.cc → assets/unzip_job.cc
diff --git a/flutter/assets/unzip_job.h → assets/unzip_job.h b/flutter/assets/unzip_job.h → assets/unzip_job.h
diff --git a/flutter/assets/zip_asset_bundle.cc → assets/zip_asset_bundle.cc b/flutter/assets/zip_asset_bundle.cc → assets/zip_asset_bundle.cc
diff --git a/flutter/assets/zip_asset_bundle.h → assets/zip_asset_bundle.h b/flutter/assets/zip_asset_bundle.h → assets/zip_asset_bundle.h
diff --git a/flutter/assets/zip_asset_store.cc → assets/zip_asset_store.cc b/flutter/assets/zip_asset_store.cc → assets/zip_asset_store.cc
@@ -11,7 +11,7 @@
 
 #include "flutter/assets/unique_unzipper.h"
 #include "flutter/assets/unzip_job.h"
-#include "glue/data_pipe_utils.h"
+#include "flutter/glue/data_pipe_utils.h"
 #include "lib/ftl/files/eintr_wrapper.h"
 #include "lib/ftl/files/unique_fd.h"
 #include "third_party/zlib/contrib/minizip/unzip.h"

diff --git a/flutter/assets/zip_asset_store.h → assets/zip_asset_store.h b/flutter/assets/zip_asset_store.h → assets/zip_asset_store.h
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
@@ -44,10 +44,10 @@ source_set("flow") {
   ]
 
   deps = [
-    "//glue",
+    "//flutter/glue",
     "//lib/ftl",
     "//mojo/services/gfx/composition/interfaces",
     "//mojo/skia",
-    "//skia",
+    "//flutter/skia",
   ]
 }
diff --git a/flow/compositor_context.cc b/flow/compositor_context.cc
@@ -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 "flow/compositor_context.h"
+#include "flutter/flow/compositor_context.h"
 
 #include "third_party/skia/include/core/SkCanvas.h"
 

diff --git a/flow/compositor_context.h b/flow/compositor_context.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_COMPOSITOR_CONTEXT_H_
-#define FLOW_COMPOSITOR_CONTEXT_H_
+#ifndef FLUTTER_FLOW_COMPOSITOR_CONTEXT_H_
+#define FLUTTER_FLOW_COMPOSITOR_CONTEXT_H_
 
 #include <memory>
 #include <string>
 
-#include "flow/instrumentation.h"
-#include "flow/raster_cache.h"
+#include "flutter/flow/instrumentation.h"
+#include "flutter/flow/raster_cache.h"
 #include "lib/ftl/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ -72,4 +72,4 @@ class CompositorContext {
 
 }  // namespace flow
 
-#endif  // FLOW_COMPOSITOR_CONTEXT_H_
+#endif  // FLUTTER_FLOW_COMPOSITOR_CONTEXT_H_
diff --git a/flow/instrumentation.cc b/flow/instrumentation.cc
@@ -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 "flow/instrumentation.h"
+#include "flutter/flow/instrumentation.h"
 
 #include <algorithm>
 

diff --git a/flow/instrumentation.h b/flow/instrumentation.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 FLOW_INSTRUMENTATION_H_
-#define FLOW_INSTRUMENTATION_H_
+#ifndef FLUTTER_FLOW_INSTRUMENTATION_H_
+#define FLUTTER_FLOW_INSTRUMENTATION_H_
 
 #include <vector>
 
@@ -67,4 +67,4 @@ class Counter {
 
 }  // namespace flow
 
-#endif  // FLOW_INSTRUMENTATION_H_
+#endif  // FLUTTER_FLOW_INSTRUMENTATION_H_
diff --git a/flow/layers/backdrop_filter_layer.cc b/flow/layers/backdrop_filter_layer.cc
@@ -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 "flow/layers/backdrop_filter_layer.h"
+#include "flutter/flow/layers/backdrop_filter_layer.h"
 
 #include "third_party/skia/include/core/SkImageFilter.h"
 

diff --git a/flow/layers/backdrop_filter_layer.h b/flow/layers/backdrop_filter_layer.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
-#define FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
 
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
 
 namespace flow {
 
@@ -27,4 +27,4 @@ class BackdropFilterLayer : public ContainerLayer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
diff --git a/flow/layers/child_scene_layer.cc b/flow/layers/child_scene_layer.cc
@@ -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 "flow/layers/child_scene_layer.h"
+#include "flutter/flow/layers/child_scene_layer.h"
 
 #include "mojo/skia/type_converters.h"
 

diff --git a/flow/layers/child_scene_layer.h b/flow/layers/child_scene_layer.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_CHILD_SCENE_LAYER_H_
-#define FLOW_LAYERS_CHILD_SCENE_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
 
-#include "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
 #include "mojo/services/gfx/composition/interfaces/scenes.mojom.h"
 
 namespace flow {
@@ -46,4 +46,4 @@ class ChildSceneLayer : public Layer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_CHILD_SCENE_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
diff --git a/flow/layers/clip_path_layer.cc b/flow/layers/clip_path_layer.cc
@@ -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 "flow/layers/clip_path_layer.h"
+#include "flutter/flow/layers/clip_path_layer.h"
 
 namespace flow {
 

diff --git a/flow/layers/clip_path_layer.h b/flow/layers/clip_path_layer.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_CLIP_PATH_LAYER_H_
-#define FLOW_LAYERS_CLIP_PATH_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CLIP_PATH_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CLIP_PATH_LAYER_H_
 
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
 
 namespace flow {
 
@@ -28,4 +28,4 @@ class ClipPathLayer : public ContainerLayer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_CLIP_PATH_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_CLIP_PATH_LAYER_H_
diff --git a/flow/layers/clip_rect_layer.cc b/flow/layers/clip_rect_layer.cc
@@ -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 "flow/layers/clip_rect_layer.h"
+#include "flutter/flow/layers/clip_rect_layer.h"
 
 namespace flow {
 

diff --git a/flow/layers/clip_rect_layer.h b/flow/layers/clip_rect_layer.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_CLIP_RECT_LAYER_H_
-#define FLOW_LAYERS_CLIP_RECT_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CLIP_RECT_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CLIP_RECT_LAYER_H_
 
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
 
 namespace flow {
 
@@ -28,4 +28,4 @@ class ClipRectLayer : public ContainerLayer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_CLIP_RECT_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_CLIP_RECT_LAYER_H_
diff --git a/flow/layers/clip_rrect_layer.cc b/flow/layers/clip_rrect_layer.cc
@@ -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 "flow/layers/clip_rrect_layer.h"
+#include "flutter/flow/layers/clip_rrect_layer.h"
 
 namespace flow {
 

diff --git a/flow/layers/clip_rrect_layer.h b/flow/layers/clip_rrect_layer.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_CLIP_RRECT_LAYER_H_
-#define FLOW_LAYERS_CLIP_RRECT_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
 
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
 
 namespace flow {
 
@@ -28,4 +28,4 @@ class ClipRRectLayer : public ContainerLayer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_CLIP_RRECT_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
diff --git a/flow/layers/color_filter_layer.cc b/flow/layers/color_filter_layer.cc
@@ -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 "flow/layers/color_filter_layer.h"
+#include "flutter/flow/layers/color_filter_layer.h"
 
 namespace flow {
 

diff --git a/flow/layers/color_filter_layer.h b/flow/layers/color_filter_layer.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_COLOR_FILTER_LAYER_H_
-#define FLOW_LAYERS_COLOR_FILTER_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
 
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
 
 namespace flow {
 
@@ -32,4 +32,4 @@ class ColorFilterLayer : public ContainerLayer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_COLOR_FILTER_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
diff --git a/flow/layers/container_layer.cc b/flow/layers/container_layer.cc
@@ -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 "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
 
 namespace flow {
 

diff --git a/flow/layers/container_layer.h b/flow/layers/container_layer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_CONTAINER_LAYER_H_
-#define FLOW_LAYERS_CONTAINER_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CONTAINER_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CONTAINER_LAYER_H_
 
 #include <vector>
-#include "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
 
 namespace flow {
 
@@ -35,4 +35,4 @@ class ContainerLayer : public Layer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_CONTAINER_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_CONTAINER_LAYER_H_
diff --git a/flow/layers/layer.cc b/flow/layers/layer.cc
@@ -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 "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
 
 #include "third_party/skia/include/core/SkColorFilter.h"
 

diff --git a/flow/layers/layer.h b/flow/layers/layer.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_LAYERS_LAYER_H_
-#define FLOW_LAYERS_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_LAYER_H_
 
 #include <memory>
 #include <vector>
 
-#include "flow/instrumentation.h"
-#include "flow/raster_cache.h"
-#include "glue/trace_event.h"
+#include "flutter/flow/instrumentation.h"
+#include "flutter/flow/raster_cache.h"
+#include "flutter/glue/trace_event.h"
 #include "lib/ftl/logging.h"
 #include "lib/ftl/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -85,4 +85,4 @@ class Layer {
 
 }  // namespace flow
 
-#endif  // FLOW_LAYERS_LAYER_H_
+#endif  // FLUTTER_FLOW_LAYERS_LAYER_H_
diff --git a/flow/layers/layer_tree.cc b/flow/layers/layer_tree.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flow/layers/layer_tree.h"
+#include "flutter/flow/layers/layer_tree.h"
 
-#include "glue/trace_event.h"
-#include "flow/layers/layer.h"
+#include "flutter/glue/trace_event.h"
+#include "flutter/flow/layers/layer.h"
 
 namespace flow {