diff options
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | gpu/BUILD.gn | 22 | ||||
| -rw-r--r-- | gpu/tools/compositor_model_bench/BUILD.gn | 28 | ||||
| -rw-r--r-- | gpu/tools/tools.gyp | 2 |
4 files changed, 30 insertions, 24 deletions
@@ -375,7 +375,7 @@ group("gn_all") { if (use_x11) { deps += [ "//media:player_x11" ] if (target_cpu != "arm") { - deps += [ "//gpu:compositor_model_bench" ] + deps += [ "//gpu/tools/compositor_model_bench" ] } } } diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index c7f70eb..c27cb8f 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -291,25 +291,3 @@ test("angle_unittests") { "//third_party/angle:translator_static", ] } - -if (is_linux && !is_chromeos && target_cpu != "arm" && use_x11) { - executable("compositor_model_bench") { - sources = [ - "tools/compositor_model_bench/compositor_model_bench.cc", - "tools/compositor_model_bench/forward_render_model.cc", - "tools/compositor_model_bench/render_model_utils.cc", - "tools/compositor_model_bench/render_models.cc", - "tools/compositor_model_bench/render_tree.cc", - "tools/compositor_model_bench/shaders.cc", - ] - - libs = [ "GL" ] - - configs += [ "//build/config/linux:x11" ] - - deps = [ - "//base", - "//ui/gl", - ] - } -} diff --git a/gpu/tools/compositor_model_bench/BUILD.gn b/gpu/tools/compositor_model_bench/BUILD.gn new file mode 100644 index 0000000..8eadc6b --- /dev/null +++ b/gpu/tools/compositor_model_bench/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ui.gni") + +if (is_linux && !is_chromeos && target_cpu != "arm" && use_x11) { + # GYP version: //gpu/tools/tools.gyp:compositor_model_bench + executable("compositor_model_bench") { + sources = [ + "compositor_model_bench.cc", + "forward_render_model.cc", + "render_model_utils.cc", + "render_models.cc", + "render_tree.cc", + "shaders.cc", + ] + + libs = [ "GL" ] + + configs += [ "//build/config/linux:x11" ] + + deps = [ + "//base", + "//ui/gl", + ] + } +} diff --git a/gpu/tools/tools.gyp b/gpu/tools/tools.gyp index 4ea41b7..342a769 100644 --- a/gpu/tools/tools.gyp +++ b/gpu/tools/tools.gyp @@ -12,7 +12,7 @@ ['OS == "linux" and target_arch != "arm" and use_x11==1', { 'targets': [ { - # GN: //gpu:compositor_model_bench + # GN version: //gpu/tools/compositor_model_bench 'target_name': 'compositor_model_bench', 'type': 'executable', 'dependencies': [ |