Add //garnet (#4043)

This repository contains FTL now in the Fuchsia build.

BUILD.gn

@@ -44,7 +44,7 @@ group("flutter") {
       "//flutter/sky/engine/wtf:wtf_unittests",
       "//flutter/synchronization:synchronization_unittests",
       "//flutter/third_party/txt:txt_unittests",
-      "//lib/ftl:ftl_unittests",
+      "//garnet/public/lib/ftl:ftl_unittests",
     ]
     if (is_linux) {
       deps += [ "//flutter/third_party/txt:txt_benchmarks" ]

DEPS

@@ -121,14 +121,11 @@ deps = {
    # build. Eventually, we'll manage these dependencies together with Fuchsia
    # and not have to specific specific hashes.
 
-  'src/lib/ftl':
-   Var('fuchsia_git') + '/ftl' + '@' + 'bd6e605513008bc074d0e8022446cea8a06a3ce7',
+  'src/garnet':
+   Var('fuchsia_git') + '/garnet' + '@' + '745be610ec5a6738d3bcbdab45b6402d477ce635',
 
   'src/lib/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + '7a9263c95612e04ae8d066fa73b56dc938b5a37b',
-
-  'src/lib/zip':
-   Var('fuchsia_git') + '/zip' + '@' + '92dc87ca645fe8e9f5151ef6dac86d8311a7222f',
+   Var('fuchsia_git') + '/tonic' + '@' + 'fca532244483192e961cb826d9d0c05947cf288c',
 
   'src/third_party/benchmark':
    Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',

assets/BUILD.gn

@@ -14,8 +14,8 @@ source_set("assets") {
 
   deps = [
     "//flutter/glue",
-    "//lib/ftl",
-    "//lib/zip",
+    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/zip",
   ]
 
   public_deps = [

build/flutter_app.gni

@@ -7,7 +7,7 @@ assert(is_fuchsia)
 import("//build/dart/dart_package.gni")
 import("//flutter/lib/ui/dart_ui.gni")
 import("//apps/mozart/lib/flutter/sdk_ext/sdk_ext.gni")
-import("//lib/fidl/dart/sdk_ext/sdk_ext.gni")
+import("//garnet/public/lib/fidl/dart/sdk_ext/sdk_ext.gni")
 
 declare_args() {
   flutter_app_default_is_jit = true

common/BUILD.gn

@@ -17,7 +17,7 @@ source_set("common") {
   ]
 
   deps = [
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
   ]
 
   public_configs = [ ":flutter_config" ]

content_handler/BUILD.gn

@@ -60,11 +60,11 @@ template("flutter_content_handler") {
              "//flutter/runtime",
              "//flutter/sky/engine/platform",
              "//flutter/vulkan",
-             "//lib/fidl/dart/sdk_ext",
-             "//lib/ftl",
+             "//garnet/public/lib/fidl/dart/sdk_ext",
+             "//garnet/public/lib/ftl",
              "//lib/mtl",
              "//lib/tonic",
-             "//lib/zip",
+             "//garnet/public/lib/zip",
              "//magma:vulkan",
              "//third_party/rapidjson",
              "//third_party/skia",

flow/BUILD.gn

@@ -49,11 +49,14 @@ source_set("flow") {
     "raster_cache_key.h",
   ]
 
+  public_deps = [
+    "//garnet/public/lib/ftl",
+  ]
+
   deps = [
     "//flutter/common",
     "//flutter/glue",
     "//flutter/synchronization",
-    "//lib/ftl",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
@@ -71,7 +74,7 @@ source_set("flow") {
     deps += [
       "//apps/mozart/lib/scene:client",
       "//apps/mozart/services/scene",
-      "//lib/fidl/dart/sdk_ext",
+      "//garnet/public/lib/fidl/dart/sdk_ext",
     ]
 
     public_deps = [

fml/BUILD.gn

@@ -25,7 +25,7 @@ source_set("fml") {
 
   deps = [
     "//dart/runtime:dart_api",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
 
     # These need to be in sync with the Fuchsia buildroot.
     "//third_party/icu",
@@ -113,6 +113,6 @@ executable("fml_unittests") {
     "//dart/runtime:libdart_jit",
     "//flutter/fml",
     "//flutter/testing",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
   ]
 }

glue/BUILD.gn

@@ -9,7 +9,7 @@ source_set("glue") {
   ]
 
   deps = [
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
   ]
 
   if (is_fuchsia) {

lib/io/BUILD.gn

@@ -11,7 +11,7 @@ source_set("io") {
   deps = [
     "//dart/runtime:dart_api",
     "//dart/runtime/bin:embedded_dart_io",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//lib/tonic/converter",
   ]
 }

lib/snapshot/BUILD.gn

@@ -20,7 +20,7 @@ import("//dart/utils/generate_patch_sdk.gni")
 
 if (is_fuchsia) {
   import("//apps/mozart/lib/flutter/sdk_ext/sdk_ext.gni")
-  import("//lib/fidl/dart/sdk_ext/sdk_ext.gni")
+  import("//garnet/public/lib/fidl/dart/sdk_ext/sdk_ext.gni")
 }
 
 bindings_output_dir = "$root_gen_dir/sky/bindings"

lib/ui/BUILD.gn

@@ -97,6 +97,6 @@ source_set("ui") {
     "//third_party/skia:gpu",
   ]
   if (is_fuchsia) {
-    deps += [ "//lib/fidl/dart/sdk_ext" ]
+    deps += [ "//garnet/public/lib/fidl/dart/sdk_ext" ]
   }
 }

runtime/BUILD.gn

@@ -79,7 +79,7 @@ source_set("runtime") {
     "//flutter/lib/io",
     "//flutter/lib/ui",
     "//flutter/sky/engine/platform",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//lib/tonic",
     "//third_party/rapidjson",
     "//third_party/skia",

runtime/dart_controller.cc

@@ -35,7 +35,7 @@ using tonic::ToDart;
 namespace blink {
 namespace {
 
-// TODO(abarth): Consider adding this to //lib/ftl.
+// TODO(abarth): Consider adding this to //garnet/public/lib/ftl.
 std::string ResolvePath(std::string path) {
   if (!path.empty() && path[0] == '/')
     return path;

shell/common/BUILD.gn

@@ -112,7 +112,7 @@ source_set("common") {
     "//flutter/runtime",
     "//flutter/sky/engine/wtf",
     "//flutter/synchronization",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//lib/tonic",
     "//third_party/rapidjson",
     "//third_party/skia",

shell/gpu/BUILD.gn

@@ -27,7 +27,7 @@ source_set("gpu") {
     "//flutter/glue",
     "//flutter/shell/common",
     "//flutter/synchronization",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]

shell/platform/android/BUILD.gn

@@ -44,7 +44,7 @@ shared_library("flutter_shell_native") {
     "//flutter/runtime",
     "//flutter/shell/common",
     "//flutter/shell/gpu",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
   ]
   if (flutter_runtime_mode == "debug") {

shell/platform/darwin/BUILD.gn

@@ -47,7 +47,7 @@ source_set("flutter_channels") {
     "//flutter/shell/gpu",
     "//flutter/shell/testing",
     "//flutter/sky/engine/wtf",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
   ]
 }

shell/platform/darwin/common/BUILD.gn

@@ -26,7 +26,7 @@ source_set("common") {
     "//flutter/shell/gpu",
     "//flutter/shell/testing",
     "//flutter/sky/engine/wtf",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
   ]
 }

shell/platform/darwin/desktop/BUILD.gn

@@ -30,7 +30,7 @@ source_set("mac_desktop_platform") {
     "//flutter/shell/platform/darwin/common",
     "//flutter/shell/testing",
     "//flutter/synchronization",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
   ]
 }

shell/platform/darwin/ios/BUILD.gn

@@ -75,7 +75,7 @@ shared_library("flutter_framework_dylib") {
     "//flutter/shell/platform/darwin/common",
     "//flutter/sky/engine/platform",
     "//flutter/sky/engine/wtf",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
   ]
   if (flutter_runtime_mode == "debug") {

shell/platform/embedder/BUILD.gn

@@ -18,7 +18,7 @@ source_set("embedder") {
     "//flutter/fml",
     "//flutter/shell/common",
     "//flutter/shell/gpu",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//lib/tonic",
     "//third_party/skia",
   ]

shell/platform/linux/BUILD.gn

@@ -16,7 +16,7 @@ executable("linux") {
     "//flutter/fml",
     "//flutter/shell/common",
     "//flutter/shell/testing",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//lib/tonic",
     "//third_party/skia",
   ]

shell/testing/BUILD.gn

@@ -15,7 +15,7 @@ source_set("testing") {
   deps = [
     "//flutter/common",
     "//flutter/shell/common",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
   ]
 }

sky/engine/core/BUILD.gn

@@ -35,7 +35,7 @@ static_library("core") {
     "//flutter/flow",
     "//flutter/glue",
     "//flutter/sky/engine/wtf",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//lib/tonic",
     "//third_party/libpng",
     "//third_party/skia",

sky/engine/wtf/BUILD.gn

@@ -197,7 +197,7 @@ source_set("wtf") {
   ]
 
   public_deps = [
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/icu",
   ]
 

synchronization/BUILD.gn

@@ -11,9 +11,9 @@ source_set("synchronization") {
     "semaphore.h",
   ]
 
-  deps = [
+  public_deps = [
     "//flutter/glue",
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
   ]
 }
 

third_party/txt/BUILD.gn

@@ -95,7 +95,7 @@ source_set("txt") {
   public_configs = [ ":txt_config" ]
 
   public_deps = [
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/harfbuzz",
     "//third_party/icu",
     "//third_party/skia",

vulkan/BUILD.gn

@@ -58,7 +58,7 @@ source_set("vulkan") {
   }
 
   deps = [
-    "//lib/ftl",
+    "//garnet/public/lib/ftl",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]