Adjust to new location of lib/tonic. (flutter#4132)

Konoha-orz · Sep 21, 2017 · fc3cb8f · fc3cb8f
1 parent 0a6e415
commit fc3cb8f
Show file tree

Hide file tree

Showing 11 changed files with 389 additions and 72 deletions.
diff --git a/DEPS b/DEPS
@@ -125,8 +125,8 @@ deps = {
   'src/garnet':
    Var('fuchsia_git') + '/garnet' + '@' + '73eeb0583e7967016ad7386a90353bf6937488b9',
 
-  'src/lib/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + '124cc47529d884bb72f4911212b3f09e6b9f330b',
+  'src/topaz/lib/tonic':
+   Var('fuchsia_git') + '/tonic' + '@' + '38c5b3b7f5968be3c5ef89a14797365adbed25e1',
 
   'src/third_party/benchmark':
    Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',

diff --git a/content_handler/BUILD.gn b/content_handler/BUILD.gn
@@ -61,17 +61,17 @@ template("flutter_content_handler") {
              "//flutter/runtime",
              "//flutter/sky/engine/platform",
              "//flutter/vulkan",
+             # TODO(abarth): This library should be public in garnet.
+             "//garnet/lib/magma:vulkan",
              "//garnet/public/dart-pkg/fuchsia",
              "//garnet/public/lib/fxl",
              "//garnet/public/lib/icu_data/cpp",
              "//garnet/public/lib/fsl",
              "//garnet/public/lib/zip",
-             "//lib/tonic",
              "//zircon/system/ulib/trace-provider",
-             # TODO(abarth): This library should be public in garnet.
-             "//garnet/lib/magma:vulkan",
              "//third_party/rapidjson",
              "//third_party/skia",
+             "//topaz/lib/tonic",
            ] + extra_deps
 
     # The flags below are needed so that Dart's CPU profiler can walk the

diff --git a/lib/io/BUILD.gn b/lib/io/BUILD.gn
@@ -12,6 +12,6 @@ source_set("io") {
     "//dart/runtime:dart_api",
     "//dart/runtime/bin:embedded_dart_io",
     "//garnet/public/lib/fxl",
-    "//lib/tonic/converter",
+    "//topaz/lib/tonic/converter",
   ]
 }
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
@@ -93,10 +93,10 @@ source_set("ui") {
     "//flutter/glue",
     "//flutter/sky/engine",
     "//flutter/third_party/txt",
-    "//lib/tonic",
     "//third_party/rapidjson",
     "//third_party/skia",
     "//third_party/skia:gpu",
+    "//topaz/lib/tonic",
   ]
   if (is_fuchsia) {
     deps += [ "//garnet/public/dart-pkg/zircon" ]

diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
@@ -79,11 +79,11 @@ source_set("runtime") {
     "//flutter/lib/io",
     "//flutter/lib/ui",
     "//flutter/sky/engine/platform",
+    "//flutter/third_party/txt",
     "//garnet/public/lib/fxl",
-    "//lib/tonic",
     "//third_party/rapidjson",
     "//third_party/skia",
-    "//flutter/third_party/txt",
+    "//topaz/lib/tonic",
   ]
 
   defines = []
@@ -96,7 +96,7 @@ source_set("runtime") {
   }
 
   if (flutter_runtime_mode != "release") {
-    deps += [ "//lib/tonic/debugger" ]
+    deps += [ "//topaz/lib/tonic/debugger" ]
   }
 
   # In AOT mode, precompiled snapshots contain the instruction buffer.

diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
@@ -114,9 +114,12 @@ source_set("common") {
     "//flutter/synchronization",
     "//flutter/third_party/txt",
     "//garnet/public/lib/fxl",
-    "//lib/tonic",
     "//third_party/rapidjson",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
+
+  public_deps = [
+    "//topaz/lib/tonic",
+  ]
 }
diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
@@ -19,8 +19,8 @@ source_set("embedder") {
     "//flutter/shell/common",
     "//flutter/shell/gpu",
     "//garnet/public/lib/fxl",
-    "//lib/tonic",
     "//third_party/skia",
+    "//topaz/lib/tonic",
   ]
 }
 

diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn
@@ -17,7 +17,7 @@ executable("linux") {
     "//flutter/shell/common",
     "//flutter/shell/testing",
     "//garnet/public/lib/fxl",
-    "//lib/tonic",
     "//third_party/skia",
+    "//topaz/lib/tonic",
   ]
 }
diff --git a/sky/engine/core/BUILD.gn b/sky/engine/core/BUILD.gn
@@ -36,13 +36,13 @@ static_library("core") {
     "//flutter/glue",
     "//flutter/sky/engine/wtf",
     "//garnet/public/lib/fxl",
-    "//lib/tonic",
     "//third_party/libpng",
     "//third_party/skia",
     "//third_party/zlib",
+    "//topaz/lib/tonic",
   ]
 
   if (flutter_runtime_mode != "release") {
-    public_deps += [ "//lib/tonic/debugger" ]
+    public_deps += [ "//topaz/lib/tonic/debugger" ]
   }
 }