Skip to content

GitLab

T
tangled
Commit 57f1c1c7 authored by dpranke@chromium.org's avatar dpranke@chromium.org
Browse files
Options

Make *some* version of the Mac GN build work again. 

R=brettw@chromium.org
TBR=haraken@chromium.org
BUG=431177

Review URL: https://codereview.chromium.org/701043002

git-svn-id: svn://svn.chromium.org/blink/trunk@185222 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 3e358e84
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 82 deletions
third_party/WebKit/Source/core/BUILD.gn
View file @ 57f1c1c7
......@@ -260,6 +260,8 @@ source_set("remaining") {
if (is_mac) {
sources -= [
"rendering/RenderThemeChromiumDefault.cpp",
"rendering/RenderThemeChromiumDefault.h",
"rendering/RenderThemeChromiumFontProvider.cpp",
"rendering/RenderThemeChromiumFontProvider.h",
"rendering/RenderThemeChromiumSkia.cpp",
......
third_party/WebKit/Source/platform/BUILD.gn
View file @ 57f1c1c7
......@@ -11,11 +11,14 @@ import("//third_party/WebKit/Source/platform/platform_generated.gni")
# Most targets in this file are private actions so use that as the default.
visibility = [ ":*" ]
heap_gypi = exec_script(
"//build/gypi_to_gn.py",
[ rebase_path("heap/blink_heap.gypi") ],
"scope",
[ "heap/blink_heap.gypi" ])
if (!is_mac) {
# TODO(GYP): can't link Blink binaries yet on mac.
heap_gypi = exec_script(
"//build/gypi_to_gn.py",
[ rebase_path("heap/blink_heap.gypi") ],
"scope",
[ "heap/blink_heap.gypi" ])
}
blink_platform_neon_files = [
"graphics/cpu/arm/WebGLImageConversionNEON.h",
......@@ -311,67 +314,70 @@ component("platform") {
}
}
test("heap_unittests") {
visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_heap_unittests"
if (!is_mac) {
# TODO(GYP): Can't link Blink binaries yet.
test("heap_unittests") {
visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_heap_unittests"
sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap")
sources += [ "heap/RunAllTests.cpp" ]
sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap")
sources += [ "heap/RunAllTests.cpp" ]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
deps = [
":platform",
"//base",
"//base/allocator",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/wtf:test_support",
"//content/test:test_support",
]
}
deps = [
":platform",
"//base",
"//base/allocator",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/wtf:test_support",
"//content/test:test_support",
]
}
test("platform_unittests") {
visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_platform_unittests"
test("platform_unittests") {
visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_platform_unittests"
sources = platform_test_files
sources = platform_test_files
sources += [ "testing/RunAllTests.cpp" ]
sources += [ "testing/RunAllTests.cpp" ]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
configs += [
"//third_party/WebKit/Source/wtf:wtf_config",
"//third_party/WebKit/Source:config",
]
deps = [
":blink_common",
":platform",
"//base",
"//base/allocator",
"//base/test:test_support",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/wtf:test_support",
"//url",
]
deps = [
":blink_common",
":platform",
"//base",
"//base/allocator",
"//base/test:test_support",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/wtf:test_support",
"//url",
]
defines = [
"INSIDE_BLINK",
]
defines = [
"INSIDE_BLINK",
]
include_dirs = [
"$root_gen_dir/blink",
]
include_dirs = [
"$root_gen_dir/blink",
]
}
}
......
third_party/WebKit/Source/web/BUILD.gn
View file @ 57f1c1c7
......@@ -105,36 +105,39 @@ source_set("test_support") {
}
# GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests
test("webkit_unit_tests") {
deps = [
":test_support",
":web",
"//base",
"//base/test:test_support",
"//base:i18n",
"//content/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/wtf:test_support",
"//third_party/libwebp",
"//third_party/zlib",
"//url",
"//v8",
]
if (!is_mac) {
# TODO(GYP): Can't link Blink binaries yet on mac.
test("webkit_unit_tests") {
deps = [
":test_support",
":web",
"//base",
"//base/test:test_support",
"//base:i18n",
"//content/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/wtf:test_support",
"//third_party/libwebp",
"//third_party/zlib",
"//url",
"//v8",
]
sources = [ "tests/RunAllTests.cpp" ]
sources = [ "tests/RunAllTests.cpp" ]
configs += [ "//third_party/WebKit/Source:config" ]
configs += [ "//third_party/WebKit/Source:config" ]
if (!is_component_build) {
deps += [ "//third_party/WebKit/Source/core" ]
if (!is_component_build) {
deps += [ "//third_party/WebKit/Source/core" ]
configs += [ "//third_party/WebKit/Source:inside_blink" ]
configs += [ "//third_party/WebKit/Source:inside_blink" ]
sources += web_gypi.web_unittest_files
sources += bindings_unittest_files
sources += core_unittest_files
sources += modules_unittest_files
sources += platform_web_unittest_files
sources += web_gypi.web_unittest_files
sources += bindings_unittest_files
sources += core_unittest_files
sources += modules_unittest_files
sources += platform_web_unittest_files
}
}
}
third_party/WebKit/public/BUILD.gn
View file @ 57f1c1c7
......@@ -46,6 +46,13 @@ group("all_blink") {
"//third_party/WebKit/Source/web",
"//third_party/WebKit/Source/wtf:wtf_unittests",
]
if (is_mac) {
# TODO(GYP): Re-enable this as soon as we can link Blink binaries on mac.
deps -= [
"//third_party/WebKit/Source/platform:heap_unittests",
"//third_party/WebKit/Source/platform:platform_unittests",
]
}
}
config("blink_headers_config") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment