diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/gin/BUILD.gn | |
parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/gin/BUILD.gn')
-rw-r--r-- | chromium/gin/BUILD.gn | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/chromium/gin/BUILD.gn b/chromium/gin/BUILD.gn index d71adf5134a..6b3a66391f1 100644 --- a/chromium/gin/BUILD.gn +++ b/chromium/gin/BUILD.gn @@ -2,9 +2,18 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/buildflag_header.gni") +import("//build/config/allocator.gni") import("//testing/test.gni") import("//v8/gni/v8.gni") +# "features" to avoid collision with existing gin_features.h file. +buildflag_header("features") { + header = "features.h" + + flags = [ "USE_PARTITION_ALLOC=$use_partition_alloc" ] +} + component("gin") { sources = [ "arguments.cc", @@ -29,15 +38,6 @@ component("gin") { "isolate_holder.cc", "modules/console.cc", "modules/console.h", - "modules/file_module_provider.cc", - "modules/file_module_provider.h", - "modules/module_registry.cc", - "modules/module_registry.h", - "modules/module_registry_observer.h", - "modules/module_runner_delegate.cc", - "modules/module_runner_delegate.h", - "modules/timer.cc", - "modules/timer.h", "object_template_builder.cc", "object_template_builder.h", "per_context_data.cc", @@ -87,6 +87,7 @@ component("gin") { defines = [ "GIN_IMPLEMENTATION" ] public_deps = [ + ":features", "//base", "//v8", ] @@ -121,20 +122,9 @@ executable("gin_shell") { source_set("gin_test") { testonly = true sources = [ - "test/file.cc", - "test/file.h", - "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", ] - data = [ - "test/expect.js", - ] public_deps = [ ":gin", @@ -155,13 +145,10 @@ test("gin_unittests") { "converter_unittest.cc", "data_object_builder_unittest.cc", "interceptor_unittest.cc", - "modules/module_registry_unittest.cc", - "modules/timer_unittest.cc", "per_context_data_unittest.cc", "shell/gin_shell_unittest.cc", "shell_runner_unittest.cc", "test/run_all_unittests.cc", - "test/run_js_tests.cc", "v8_isolate_memory_dump_provider_unittest.cc", "v8_platform_unittest.cc", "wrappable_unittest.cc", @@ -174,13 +161,13 @@ test("gin_unittests") { "//v8", ] - configs += [ "//v8:external_startup_data" ] + configs += [ + "//tools/v8_context_snapshot:use_v8_context_snapshot", + "//v8:external_startup_data", + ] data = [ - "modules/module_registry_unittests.js", "shell/hello_world.js", - "test/file_unittests.js", - "test/gtest_unittests.js", "../OWNERS", ] |