Don't use Skia BUILD.gn files (#47677)

The new `BUILD.gn` files in the Engine tree can't go under `build/secondary` because Skia still has its own, and they'd be selected first. So, this PR puts the new `BUILD.gn` files under `flutter/skia`.
flutter · Nov 7, 2023 · 64d5af2 · 64d5af2
1 parent be43db3
commit 64d5af2
Show file tree

Hide file tree

Showing 37 changed files with 1,323 additions and 55 deletions.
diff --git a/common/graphics/BUILD.gn b/common/graphics/BUILD.gn
@@ -26,9 +26,9 @@ source_set("graphics") {
     "//flutter/fml",
     "//flutter/shell/common:base64",
     "//flutter/shell/version:version",
+    "//flutter/skia",
     "//flutter/third_party/rapidjson",
     "//third_party/boringssl",
-    "//third_party/skia",
   ]
 
   public_configs = [ "//flutter:config" ]

diff --git a/display_list/BUILD.gn b/display_list/BUILD.gn
@@ -88,7 +88,7 @@ source_set("display_list") {
     "//flutter/fml",
     "//flutter/impeller/runtime_stage",
     "//flutter/impeller/typographer",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   if (!defined(defines)) {
@@ -218,10 +218,10 @@ source_set("display_list_benchmarks_source") {
     "//flutter/display_list/testing:display_list_surface_provider",
     "//flutter/display_list/testing:display_list_testing",
     "//flutter/fml",
+    "//flutter/skia",
     "//flutter/testing:skia",
     "//flutter/testing:testing_lib",
     "//third_party/dart/runtime:libdart_jit",  # for tracing
-    "//third_party/skia",
   ]
 }
 

diff --git a/display_list/testing/BUILD.gn b/display_list/testing/BUILD.gn
@@ -15,8 +15,8 @@ source_set("display_list_testing") {
   ]
 
   deps = [
+    "//flutter/skia",
     "//flutter/testing:testing_lib",
-    "//third_party/skia",
   ]
 
   public_deps = [ "//flutter/display_list:display_list" ]

diff --git a/flow/BUILD.gn b/flow/BUILD.gn
@@ -96,7 +96,7 @@ source_set("flow") {
     "//flutter/fml",
   ]
 
-  deps = [ "//third_party/skia" ]
+  deps = [ "//flutter/skia" ]
 
   if (impeller_supports_rendering) {
     deps += [
@@ -190,11 +190,11 @@ if (enable_unittests) {
       "//flutter/display_list/testing:display_list_testing",
       "//flutter/fml",
       "//flutter/shell/common:base64",
+      "//flutter/skia",
       "//flutter/testing:skia",
       "//flutter/testing:testing_lib",
       "//third_party/dart/runtime:libdart_jit",  # for tracing
       "//third_party/googletest:gtest",
-      "//third_party/skia",
     ]
 
     if (!defined(defines)) {

diff --git a/flutter_vma/BUILD.gn b/flutter_vma/BUILD.gn
@@ -32,7 +32,7 @@ source_set("flutter_skia_vma") {
   public_deps = [
     ":flutter_vma",
     "//flutter/fml",
+    "//flutter/skia",
     "//flutter/vulkan/procs",
-    "//third_party/skia",
   ]
 }
diff --git a/impeller/display_list/BUILD.gn b/impeller/display_list/BUILD.gn
@@ -15,8 +15,8 @@ impeller_component("skia_conversions") {
     "../geometry",
     "//flutter/display_list",
     "//flutter/fml",
-    "//third_party/skia",
-    "//third_party/skia/modules/skparagraph",
+    "//flutter/skia",
+    "//flutter/skia/modules/skparagraph",
   ]
 }
 
@@ -38,7 +38,7 @@ impeller_component("display_list") {
     "//flutter/display_list",
     "//flutter/fml",
     "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   if (!defined(defines)) {

diff --git a/impeller/image/BUILD.gn b/impeller/image/BUILD.gn
@@ -36,7 +36,7 @@ impeller_component("image_skia_backend") {
 
   deps = [
     "//flutter/fml",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 

diff --git a/impeller/typographer/backends/skia/BUILD.gn b/impeller/typographer/backends/skia/BUILD.gn
@@ -18,6 +18,6 @@ impeller_component("typographer_skia_backend") {
 
   public_deps = [
     "//flutter/impeller/typographer",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
@@ -163,8 +163,8 @@ source_set("ui") {
     "//flutter/flow",
     "//flutter/shell/common:display",
     "//flutter/shell/common:platform_message_handler",
+    "//flutter/skia/modules/skparagraph",
     "//flutter/third_party/txt",
-    "//third_party/skia/modules/skparagraph",
   ]
 
   deps = [
@@ -176,10 +176,10 @@ source_set("ui") {
     "//flutter/impeller/runtime_stage",
     "//flutter/runtime:dart_plugin_registrant",
     "//flutter/runtime:test_font",
+    "//flutter/skia",
     "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
     "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/skia",
     "//third_party/zlib:zlib",
   ]
 

diff --git a/lib/web_ui/skwasm/BUILD.gn b/lib/web_ui/skwasm/BUILD.gn
@@ -66,7 +66,7 @@ wasm_lib("skwasm") {
   }
 
   deps = [
-    "//third_party/skia",
-    "//third_party/skia/modules/skparagraph",
+    "//flutter/skia",
+    "//flutter/skia/modules/skparagraph",
   ]
 }
diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
@@ -10,7 +10,7 @@ source_set("test_font") {
     "test_font_data.cc",
     "test_font_data.h",
   ]
-  deps = [ "//third_party/skia" ]
+  deps = [ "//flutter/skia" ]
   public_configs = [ "//flutter:config" ]
   defines = []
   if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) {
@@ -106,11 +106,11 @@ source_set("runtime") {
     "//flutter/fml",
     "//flutter/lib/io",
     "//flutter/shell/common:display",
+    "//flutter/skia",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
     "//third_party/dart/runtime:dart_api",
     "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/skia",
   ]
 
   if (flutter_runtime_mode != "release" && !is_fuchsia) {
@@ -147,12 +147,12 @@ if (enable_unittests) {
       "//flutter/common",
       "//flutter/fml",
       "//flutter/lib/snapshot",
+      "//flutter/skia",
       "//flutter/testing",
       "//flutter/testing:dart",
       "//flutter/testing:fixture_test",
       "//flutter/third_party/tonic",
       "//third_party/dart/runtime/bin:elf_loader",
-      "//third_party/skia",
     ]
   }
 

diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
@@ -145,8 +145,8 @@ source_set("common") {
     "//flutter/runtime",
     "//flutter/shell/common:base64",
     "//flutter/shell/profiling",
+    "//flutter/skia",
     "//third_party/dart/runtime:dart_api",
-    "//third_party/skia",
   ]
 
   if (impeller_supports_rendering) {
@@ -256,10 +256,10 @@ if (enable_unittests) {
       "//flutter/assets",
       "//flutter/common",
       "//flutter/lib/ui",
+      "//flutter/skia",
       "//flutter/testing:dart",
       "//flutter/testing:fixture_test",
       "//flutter/third_party/rapidjson",
-      "//third_party/skia",
     ]
 
     public_configs = [

diff --git a/shell/gpu/BUILD.gn b/shell/gpu/BUILD.gn
@@ -12,7 +12,7 @@ gpu_common_deps = [
   "//flutter/flow",
   "//flutter/fml",
   "//flutter/shell/common",
-  "//third_party/skia",
+  "//flutter/skia",
 ]
 
 source_set("gpu_surface_software") {

diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
@@ -29,7 +29,7 @@ source_set("image_generator") {
   deps = [
     "//flutter/fml",
     "//flutter/lib/ui:ui",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   libs = [
@@ -153,8 +153,8 @@ source_set("flutter_shell_native_src") {
     "//flutter/shell/platform/android/platform_view_android_delegate",
     "//flutter/shell/platform/android/surface",
     "//flutter/shell/platform/android/surface:native_window",
+    "//flutter/skia",
     "//flutter/vulkan",
-    "//third_party/skia",
   ]
 
   public_configs = [ "//flutter:config" ]

diff --git a/shell/platform/android/context/BUILD.gn b/shell/platform/android/context/BUILD.gn
@@ -16,7 +16,7 @@ source_set("context") {
   deps = [
     "//flutter/fml",
     "//flutter/impeller/renderer",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   if (shell_enable_vulkan) {

diff --git a/shell/platform/android/external_view_embedder/BUILD.gn b/shell/platform/android/external_view_embedder/BUILD.gn
@@ -22,7 +22,7 @@ source_set("external_view_embedder") {
     "//flutter/shell/platform/android/context",
     "//flutter/shell/platform/android/jni",
     "//flutter/shell/platform/android/surface",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 

diff --git a/shell/platform/android/jni/BUILD.gn b/shell/platform/android/jni/BUILD.gn
@@ -18,7 +18,7 @@ source_set("jni") {
     "//flutter/fml",
     "//flutter/lib/ui",
     "//flutter/shell/platform/android/surface:native_window",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 

diff --git a/shell/platform/android/platform_view_android_delegate/BUILD.gn b/shell/platform/android/platform_view_android_delegate/BUILD.gn
@@ -19,7 +19,7 @@ source_set("platform_view_android_delegate") {
     "//flutter/lib/ui",
     "//flutter/shell/common",
     "//flutter/shell/platform/android/jni",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 

diff --git a/shell/platform/android/surface/BUILD.gn b/shell/platform/android/surface/BUILD.gn
@@ -21,7 +21,7 @@ source_set("surface") {
     "//flutter/shell/common",
     "//flutter/shell/platform/android/context",
     "//flutter/shell/platform/android/jni",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 
@@ -35,7 +35,7 @@ source_set("native_window") {
 
   deps = [
     "//flutter/fml",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 

diff --git a/shell/platform/darwin/graphics/BUILD.gn b/shell/platform/darwin/graphics/BUILD.gn
@@ -36,7 +36,7 @@ source_set("graphics") {
 
   frameworks = [ "CoreVideo.framework" ]
 
-  public_deps = [ "//third_party/skia" ]
+  public_deps = [ "//flutter/skia" ]
 
   public_configs = [ "//flutter:config" ]
 }
diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn
@@ -193,8 +193,8 @@ source_set("flutter_framework_source") {
     "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/profiling:profiling",
+    "//flutter/skia",
     "//flutter/third_party/spring_animation",
-    "//third_party/skia",
   ]
 
   public_configs = [
@@ -255,11 +255,11 @@ source_set("ios_test_flutter_mrc") {
     "//flutter/shell/common:common",
     "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
+    "//flutter/skia",
     "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
     "//third_party/ocmock:ocmock_shared",
-    "//third_party/skia",
   ]
 
   if (shell_enable_vulkan) {
@@ -327,12 +327,12 @@ shared_library("ios_test_flutter") {
     "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/embedder:embedder_test_utils",
+    "//flutter/skia",
     "//flutter/third_party/rapidjson",
     "//flutter/third_party/spring_animation",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
     "//third_party/ocmock:ocmock_shared",
-    "//third_party/skia",
   ]
   public_configs = [
     ":ios_gpu_configuration_config",

diff --git a/shell/platform/darwin/macos/BUILD.gn b/shell/platform/darwin/macos/BUILD.gn
@@ -125,7 +125,7 @@ source_set("flutter_framework_source") {
     "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/darwin/graphics:graphics",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   public_configs = [ "//flutter:config" ]

diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
@@ -108,10 +108,10 @@ template("embedder_source_set") {
       "//flutter/lib/ui",
       "//flutter/runtime:libdart",
       "//flutter/shell/common",
+      "//flutter/skia",
       "//flutter/third_party/tonic",
       "//third_party/dart/runtime/bin:dart_io_api",
       "//third_party/dart/runtime/bin:elf_loader",
-      "//third_party/skia",
     ]
 
     if (embedder_enable_gl) {
@@ -288,12 +288,12 @@ if (enable_unittests) {
       "//flutter/lib/snapshot",
       "//flutter/lib/ui",
       "//flutter/runtime",
+      "//flutter/skia",
       "//flutter/testing",
       "//flutter/testing:dart",
       "//flutter/testing:skia",
       "//flutter/third_party/tonic",
       "//third_party/dart/runtime/bin:elf_loader",
-      "//third_party/skia",
     ]
 
     if (test_enable_gl) {
@@ -410,7 +410,7 @@ if (enable_unittests) {
       #"//flutter/testing:skia",
       #"//flutter/third_party/tonic",
       #"//third_party/dart/runtime/bin:elf_loader",
-      #"//third_party/skia",
+      #"//flutter/skia",
     ]
   }
 }

diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn
@@ -40,10 +40,10 @@ executable("testing") {
     "//flutter/lib/snapshot",
     "//flutter/shell/common",
     "//flutter/shell/gpu:gpu_surface_software",
+    "//flutter/skia",
     "//flutter/third_party/tonic",
     "//third_party/dart/runtime:libdart_jit",
     "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/skia",
   ]
 
   if (impeller_supports_rendering) {