Commit 57f1c1c7 authored by dpranke@chromium.org's avatar dpranke@chromium.org

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
...@@ -260,6 +260,8 @@ source_set("remaining") { ...@@ -260,6 +260,8 @@ source_set("remaining") {
if (is_mac) { if (is_mac) {
sources -= [ sources -= [
"rendering/RenderThemeChromiumDefault.cpp",
"rendering/RenderThemeChromiumDefault.h",
"rendering/RenderThemeChromiumFontProvider.cpp", "rendering/RenderThemeChromiumFontProvider.cpp",
"rendering/RenderThemeChromiumFontProvider.h", "rendering/RenderThemeChromiumFontProvider.h",
"rendering/RenderThemeChromiumSkia.cpp", "rendering/RenderThemeChromiumSkia.cpp",
......
...@@ -11,11 +11,14 @@ import("//third_party/WebKit/Source/platform/platform_generated.gni") ...@@ -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. # Most targets in this file are private actions so use that as the default.
visibility = [ ":*" ] visibility = [ ":*" ]
heap_gypi = exec_script( if (!is_mac) {
# TODO(GYP): can't link Blink binaries yet on mac.
heap_gypi = exec_script(
"//build/gypi_to_gn.py", "//build/gypi_to_gn.py",
[ rebase_path("heap/blink_heap.gypi") ], [ rebase_path("heap/blink_heap.gypi") ],
"scope", "scope",
[ "heap/blink_heap.gypi" ]) [ "heap/blink_heap.gypi" ])
}
blink_platform_neon_files = [ blink_platform_neon_files = [
"graphics/cpu/arm/WebGLImageConversionNEON.h", "graphics/cpu/arm/WebGLImageConversionNEON.h",
...@@ -311,7 +314,9 @@ component("platform") { ...@@ -311,7 +314,9 @@ component("platform") {
} }
} }
test("heap_unittests") { if (!is_mac) {
# TODO(GYP): Can't link Blink binaries yet.
test("heap_unittests") {
visibility = [] # Allow re-assignment of list. visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ] visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_heap_unittests" output_name = "blink_heap_unittests"
...@@ -335,9 +340,9 @@ test("heap_unittests") { ...@@ -335,9 +340,9 @@ test("heap_unittests") {
"//third_party/WebKit/Source/wtf:test_support", "//third_party/WebKit/Source/wtf:test_support",
"//content/test:test_support", "//content/test:test_support",
] ]
} }
test("platform_unittests") { test("platform_unittests") {
visibility = [] # Allow re-assignment of list. visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ] visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_platform_unittests" output_name = "blink_platform_unittests"
...@@ -372,6 +377,7 @@ test("platform_unittests") { ...@@ -372,6 +377,7 @@ test("platform_unittests") {
include_dirs = [ include_dirs = [
"$root_gen_dir/blink", "$root_gen_dir/blink",
] ]
}
} }
......
...@@ -105,7 +105,9 @@ source_set("test_support") { ...@@ -105,7 +105,9 @@ source_set("test_support") {
} }
# GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests # GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests
test("webkit_unit_tests") { if (!is_mac) {
# TODO(GYP): Can't link Blink binaries yet on mac.
test("webkit_unit_tests") {
deps = [ deps = [
":test_support", ":test_support",
":web", ":web",
...@@ -137,4 +139,5 @@ test("webkit_unit_tests") { ...@@ -137,4 +139,5 @@ test("webkit_unit_tests") {
sources += modules_unittest_files sources += modules_unittest_files
sources += platform_web_unittest_files sources += platform_web_unittest_files
} }
}
} }
...@@ -46,6 +46,13 @@ group("all_blink") { ...@@ -46,6 +46,13 @@ group("all_blink") {
"//third_party/WebKit/Source/web", "//third_party/WebKit/Source/web",
"//third_party/WebKit/Source/wtf:wtf_unittests", "//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") { 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