diff options
| -rw-r--r-- | content/BUILD.gn | 6 | ||||
| -rw-r--r-- | content/public/renderer/BUILD.gn | 1 | ||||
| -rw-r--r-- | content/renderer/BUILD.gn | 10 | ||||
| -rw-r--r-- | gin/BUILD.gn | 107 | ||||
| -rw-r--r-- | gin/gin.gyp | 2 | ||||
| -rw-r--r-- | gpu/BUILD.gn | 5 | ||||
| -rw-r--r-- | webkit/child/BUILD.gn | 2 | ||||
| -rw-r--r-- | webkit/common/gpu/BUILD.gn | 42 |
8 files changed, 110 insertions, 65 deletions
diff --git a/content/BUILD.gn b/content/BUILD.gn index d065e1b..3be5542 100644 --- a/content/BUILD.gn +++ b/content/BUILD.gn @@ -58,8 +58,10 @@ config("libjingle_stub_config") { } } -# This config is a placeholder to set up the V8 include path while the V8 GN -# build is being worked on. +# This config is a placeholder to set up the V8 include path while Blink is +# being worked on. Some targets include blink headers which include "v8.h", +# expecting //v8/include to be on the include search path. We need to track +# this down and set the include paths properly. config("v8_stub_config") { include_dirs = [ "//v8/include" ] } diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn index c5441796..9984c6f 100644 --- a/content/public/renderer/BUILD.gn +++ b/content/public/renderer/BUILD.gn @@ -20,6 +20,7 @@ source_set("renderer") { "//content/renderer", "//skia", "//third_party/WebKit/public:blink_headers", + "//v8", ] if (enable_webrtc) { diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index 38a168c..ed0cf04 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -40,6 +40,11 @@ source_set("renderer") { "//ui/events:dom4_keycode_converter", "//ui/native_theme", "//ui/surface", + "//v8", + "//webkit/child", + "//webkit/common", + "//webkit/common:storage", + "//webkit/common/gpu", # TODO(GYP) #'../jingle/jingle.gyp:jingle_glue', #'../media/media.gyp:media', @@ -47,13 +52,8 @@ source_set("renderer") { #'../third_party/WebKit/public/blink.gyp:blink', #'../third_party/libjingle/libjingle.gyp:libjingle', #'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', - #'../v8/tools/gyp/v8.gyp:v8', - #'../webkit/child/webkit_child.gyp:webkit_child', - #'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', - #'../webkit/common/webkit_common.gyp:webkit_common', #'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings', #'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', - #'../webkit/storage_common.gyp:webkit_storage_common', ] if (!enable_notifications) { diff --git a/gin/BUILD.gn b/gin/BUILD.gn index 99fd1bd..7b3f06e 100644 --- a/gin/BUILD.gn +++ b/gin/BUILD.gn @@ -58,73 +58,68 @@ component("gin") { deps = [ "//base", "//base/third_party/dynamic_annotations", - #TODO(GYP) - #"//v8", + "//v8", ] forward_dependent_configs_from = [ "//base", - #TODO(GYP) - #"//v8", + "//v8", ] } -# TODO(GYP) needs v8 -if (false) { - executable("gin_shell") { - sources = [ - "shell/gin_main.cc", - ] +executable("gin_shell") { + sources = [ + "shell/gin_main.cc", + ] - deps = [ - ":gin", - "//base", - "//base:i18n", - "//v8", - ] - } + deps = [ + ":gin", + "//base", + "//base:i18n", + "//v8", + ] +} - source_set("gin_test") { - sources = [ - "test/file_runner.cc", - "test/file_runner.h", - "test/gc.cc", - "test/gc.h", - "test/gtest.cc", - "test/gtest.h", - "test/v8_test.cc", - "test/v8_test.h", - ] +source_set("gin_test") { + sources = [ + "test/file_runner.cc", + "test/file_runner.h", + "test/gc.cc", + "test/gc.h", + "test/gtest.cc", + "test/gtest.h", + "test/v8_test.cc", + "test/v8_test.h", + ] - deps = [ - ":gin", - "//testing/gtest", - "//v8", - ] + deps = [ + ":gin", + "//testing/gtest", + "//v8", + ] - forward_dependent_configs_from = [ - ":gin", - "//testing/gtest", - ] - } + forward_dependent_configs_from = [ + ":gin", + "//testing/gtest", + ] +} - test("gin_unittests") { - sources = [ - "converter_unittest.cc", - "interceptor_unittest.cc", - "modules/module_registry_unittest.cc", - "modules/timer_unittest.cc", - "per_context_data_unittest.cc", - "shell_runner_unittest.cc", - "test/run_all_unittests.cc", - "test/run_js_tests.cc", - "wrappable_unittest.cc", - ] +test("gin_unittests") { + sources = [ + "converter_unittest.cc", + "interceptor_unittest.cc", + "modules/module_registry_unittest.cc", + "modules/timer_unittest.cc", + "per_context_data_unittest.cc", + "shell_runner_unittest.cc", + "test/run_all_unittests.cc", + "test/run_js_tests.cc", + "wrappable_unittest.cc", + ] - deps = [ - ":gin_test", - "//base/test:run_all_unittests", - "//v8", - ] - } + deps = [ + ":gin_test", + "//base/test:test_support", + "//v8", + ] } diff --git a/gin/gin.gyp b/gin/gin.gyp index f7f25a91..6ee6065 100644 --- a/gin/gin.gyp +++ b/gin/gin.gyp @@ -119,7 +119,7 @@ 'target_name': 'gin_unittests', 'type': 'executable', 'dependencies': [ - '../base/base.gyp:run_all_unittests', + '../base/base.gyp:test_support_base', '../v8/tools/gyp/v8.gyp:v8', 'gin_test', ], diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index b810a8a..684a0ff 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -8,6 +8,11 @@ # # gpu.gyp:command_buffer_common => //gpu/command_buffer/common # +# gpu.gyp:command_buffer_service => //gpu/command_buffer/service + +# gpu/gpu.gyp:gl_in_process_context => +# //gpu/command_buffer/client:gl_in_process_context +# # gpu.gyp:gles2_cmd_helper => //gpu/command_buffer/client:gles2_cmd_helper # # gpu.gyp:gles2_c_lib => //gpu/command_buffer/client:gles2_c_lib diff --git a/webkit/child/BUILD.gn b/webkit/child/BUILD.gn index 04611e4..f0c3626 100644 --- a/webkit/child/BUILD.gn +++ b/webkit/child/BUILD.gn @@ -44,7 +44,7 @@ component("child") { "//ui/gfx/geometry", "//ui/native_theme", "//url", - #"//v8", TODO(GYP) + "//v8", "//webkit/common", ] } diff --git a/webkit/common/gpu/BUILD.gn b/webkit/common/gpu/BUILD.gn new file mode 100644 index 0000000..a408f9a --- /dev/null +++ b/webkit/common/gpu/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright 2014 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. + +component("gpu") { + sources = [ + "context_provider_in_process.cc", + "context_provider_in_process.h", + "context_provider_web_context.h", + "grcontext_for_webgraphicscontext3d.cc", + "grcontext_for_webgraphicscontext3d.h", + "webgraphicscontext3d_impl.cc", + "webgraphicscontext3d_impl.h", + "webgraphicscontext3d_in_process_command_buffer_impl.cc", + "webgraphicscontext3d_in_process_command_buffer_impl.h", + ] + + defines = [ "WEBKIT_GPU_IMPLEMENTATION" ] + configs += [ "//build/config/compiler:wexit_time_destructors" ] + if (is_win) { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] + } + + deps = [ + "//base", + "//base/third_party/dynamic_annotations", + "//cc", + "//gpu/command_buffer/common", + "//gpu/command_buffer/service", + "//gpu/command_buffer/client:gles2_c_lib", + "//gpu/command_buffer/client:gles2_implementation", + "//gpu/command_buffer/client:gl_in_process_context", + "//gpu/skia_bindings", + "//skia", + #"//third_party/WebKit/public:blink_minimal", TODO(GYP) + "//third_party/angle:translator", + "//ui/gl", + "//ui/gfx", + "//ui/gfx/geometry", + ] +} |