[fuchsia] Migrate to SDK-provided FIDL & package targets. Bug: chromium:1050703 Change-Id: I7c031f4501b567fde117c30b25f0bc071d4acc44 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2058948 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/BUILD.gn b/src/libANGLE/renderer/vulkan/BUILD.gn index d713b3a..d6af15c 100644 --- a/src/libANGLE/renderer/vulkan/BUILD.gn +++ b/src/libANGLE/renderer/vulkan/BUILD.gn
@@ -169,7 +169,7 @@ public_deps += [ "$angle_root/src/common/fuchsia_egl", "//third_party/fuchsia-sdk:vulkan_base", - "//third_party/fuchsia-sdk/sdk:vulkan", + "//third_party/fuchsia-sdk/sdk/pkg/vulkan", ] } else if (!is_android && !is_ggp) { data_deps = [ "$angle_root/third_party/vulkan-loader/src:libvulkan" ]
diff --git a/util/BUILD.gn b/util/BUILD.gn index efbb1ff..a6f373e 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn
@@ -5,10 +5,19 @@ import("../gni/angle.gni") _util_sources = [ + "EGLPlatformParameters.h", + "EGLWindow.cpp", + "EGLWindow.h", + "Event.h", + "Matrix.cpp", + "Matrix.h", + "OSPixmap.h", + "OSWindow.cpp", + "OSWindow.h", "com_utils.h", - "keyboard.h", "geometry_utils.cpp", "geometry_utils.h", + "keyboard.h", "mouse.h", "random_utils.cpp", "random_utils.h", @@ -16,15 +25,6 @@ "shader_utils.h", "util_export.h", "util_gl.h", - "Event.h", - "EGLPlatformParameters.h", - "EGLWindow.cpp", - "EGLWindow.h", - "Matrix.cpp", - "Matrix.h", - "OSPixmap.h", - "OSWindow.cpp", - "OSWindow.h", ] if (is_win) { @@ -63,10 +63,10 @@ if (is_mac) { _util_sources += [ - "osx/OSXPixmap.mm", "osx/OSXPixmap.h", - "osx/OSXWindow.mm", + "osx/OSXPixmap.mm", "osx/OSXWindow.h", + "osx/OSXWindow.mm", ] } @@ -100,9 +100,7 @@ sources += [ "windows/wgl_loader_autogen.h" ] } - public_deps = [ - "$angle_root:includes", - ] + public_deps = [ "$angle_root:includes" ] public_configs = [ ":angle_util_loader_headers_config" ] } @@ -120,9 +118,7 @@ sources += [ "windows/wgl_loader_autogen.cpp" ] } - deps = [ - ":angle_util_loader_headers", - ] + deps = [ ":angle_util_loader_headers" ] public_configs += [ "$angle_root:no_gl_prototypes", @@ -195,14 +191,14 @@ if (is_fuchsia) { public_deps += [ "$angle_root/src/common/fuchsia_egl", - "//third_party/fuchsia-sdk/sdk:async-loop-cpp", - "//third_party/fuchsia-sdk/sdk:async-loop-default", - "//third_party/fuchsia-sdk/sdk:fdio", - "//third_party/fuchsia-sdk/sdk:fuchsia-images", - "//third_party/fuchsia-sdk/sdk:fuchsia-ui-policy", - "//third_party/fuchsia-sdk/sdk:fuchsia-ui-scenic", - "//third_party/fuchsia-sdk/sdk:fuchsia-ui-views", - "//third_party/fuchsia-sdk/sdk:scenic_cpp", + "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.images", + "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy", + "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.scenic", + "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.views", + "//third_party/fuchsia-sdk/sdk/pkg/async-loop-cpp", + "//third_party/fuchsia-sdk/sdk/pkg/async-loop-default", + "//third_party/fuchsia-sdk/sdk/pkg/fdio", + "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp", ] } @@ -257,9 +253,7 @@ angle_source_set("angle_test_utils") { public_configs = [ ":angle_test_util_config" ] - deps = [ - "$angle_root:angle_common", - ] + deps = [ "$angle_root:angle_common" ] sources = [ "Timer.cpp", "Timer.h",