Get content_unittests to link on the mac GN build.
This fixes dependencies for the mac cups and sanbox libraries, and adds a missing dependency on //ui/compositor:test_support. R=brettw@chromium.org BUG=431177 CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/1263513004 Cr-Commit-Position: refs/heads/master@{#341458}
This commit is contained in:
1
BUILD.gn
1
BUILD.gn
@ -541,7 +541,6 @@ group("both_gn_and_gyp") {
|
||||
"//components:components_unittests", # TODO(GYP)
|
||||
"//content/test:content_browsertests", # TODO(GYP)
|
||||
"//content/test:content_perftests", # TODO(GYP)
|
||||
"//content/test:content_unittests", # TODO(GYP)
|
||||
"//device:device_unittests", # TODO(GYP)
|
||||
"//extensions:extensions_browsertests", # TODO(GYP)
|
||||
"//extensions:extensions_unittests", # TODO(GYP)
|
||||
|
@ -6,6 +6,9 @@ import("//build/config/features.gni")
|
||||
import("//build/config/ui.gni")
|
||||
import("//content/common/common.gni")
|
||||
import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
|
||||
if (is_mac) {
|
||||
import("//build/config/mac/mac_sdk.gni")
|
||||
}
|
||||
|
||||
if (is_chromeos && current_cpu != "arm") {
|
||||
action("libva_generate_stubs") {
|
||||
@ -228,10 +231,12 @@ source_set("common") {
|
||||
"//third_party/WebKit/public:resources",
|
||||
"//ui/accelerated_widget_mac",
|
||||
]
|
||||
lib_dirs = [ "$mac_sdk_path/usr/lib" ]
|
||||
libs += [
|
||||
"IOSurface.framework",
|
||||
"OpenGL.framework",
|
||||
"QuartzCore.framework",
|
||||
"sandbox",
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -562,6 +562,7 @@ test("content_unittests") {
|
||||
"//third_party/icu",
|
||||
"//third_party/leveldatabase",
|
||||
"//third_party/libjingle",
|
||||
"//ui/compositor:test_support",
|
||||
"//ui/gl",
|
||||
"//ui/gl:test_support",
|
||||
]
|
||||
|
@ -235,7 +235,8 @@ if (use_cups) {
|
||||
defines = [ "USE_CUPS" ]
|
||||
|
||||
if (is_mac) {
|
||||
ldflags = [ "$mac_sdk_path/usr/lib/libcups.dylib" ]
|
||||
libs = [ "cups" ]
|
||||
lib_dirs = [ "$mac_sdk_path/usr/lib" ]
|
||||
} else {
|
||||
libs = exec_script("cups_config_helper.py", [ "--libs-for-gn" ], "value")
|
||||
}
|
||||
|
Reference in New Issue
Block a user