| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 import("//third_party/WebKit/Source/bindings/bindings.gni") | 7 import("//third_party/WebKit/Source/bindings/bindings.gni") |
| 8 import("//third_party/WebKit/Source/config.gni") | 8 import("//third_party/WebKit/Source/config.gni") |
| 9 import("//third_party/WebKit/Source/core/core.gni") | 9 import("//third_party/WebKit/Source/core/core.gni") |
| 10 import("//third_party/WebKit/Source/modules/modules.gni") | 10 import("//third_party/WebKit/Source/modules/modules.gni") |
| 11 import("//third_party/WebKit/Source/platform/platform.gni") | 11 import("//third_party/WebKit/Source/platform/platform.gni") |
| 12 | 12 |
| 13 visibility = [ "//third_party/WebKit/*" ] | 13 visibility = [ "//third_party/WebKit/*" ] |
| 14 web_gypi = exec_script("//build/gypi_to_gn.py", | 14 web_gypi = exec_script("//build/gypi_to_gn.py", |
| 15 [ rebase_path("web.gypi") ], | 15 [ rebase_path("web.gypi") ], |
| 16 "scope", | 16 "scope", |
| 17 [ "web.gypi" ]) | 17 [ "web.gypi" ]) |
| 18 web_unittest_files = web_gypi.web_unittest_files | 18 web_unittest_files = web_gypi.web_unittest_files |
| 19 if (!is_mac) { |
| 20 web_unittest_files += [ "tests/ScrollAnimatorTest.cpp" ] |
| 21 } |
| 19 | 22 |
| 20 component("web") { | 23 component("web") { |
| 21 output_name = "blink_web" | 24 output_name = "blink_web" |
| 22 | 25 |
| 23 deps = [ | 26 deps = [ |
| 24 "//third_party/WebKit/Source/core", | 27 "//third_party/WebKit/Source/core", |
| 25 "//third_party/WebKit/Source/modules", | 28 "//third_party/WebKit/Source/modules", |
| 26 "//third_party/WebKit/Source/platform", | 29 "//third_party/WebKit/Source/platform", |
| 27 "//skia", | 30 "//skia", |
| 28 "//third_party/icu", | 31 "//third_party/icu", |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 141 } |
| 139 | 142 |
| 140 if (is_android) { | 143 if (is_android) { |
| 141 apk_deps = [ | 144 apk_deps = [ |
| 142 "//base:base_java", | 145 "//base:base_java", |
| 143 "//content/shell/android:content_shell_assets", | 146 "//content/shell/android:content_shell_assets", |
| 144 "//net/android:net_java", | 147 "//net/android:net_java", |
| 145 ] | 148 ] |
| 146 } | 149 } |
| 147 } | 150 } |
| OLD | NEW |