diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 20:26:48 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 20:26:48 +0000 |
commit | 229094b938e29f8b7118cfb949112575295cd92d (patch) | |
tree | 9ec7899adb3421a940e668980ca28ebacb415473 /gin | |
parent | 51c9abfa3e4dc0d11d26f885bb76461584288185 (diff) | |
download | chromium_src-229094b938e29f8b7118cfb949112575295cd92d.zip chromium_src-229094b938e29f8b7118cfb949112575295cd92d.tar.gz chromium_src-229094b938e29f8b7118cfb949112575295cd92d.tar.bz2 |
Hook up V8 to more of the GN build.
Implement webkit/common/gpu.
Minor fixes to the gin unit tests (it defines its own test runner so shouldn't depend on run_all_unittests -- GN found this because run_all_unittests in the GN build is a source_set instead of a static library and results in a duplicate definition).
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/319583004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gin')
-rw-r--r-- | gin/BUILD.gn | 107 | ||||
-rw-r--r-- | gin/gin.gyp | 2 |
2 files changed, 52 insertions, 57 deletions
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', ], |