This gets at least a chunk of the Mac GN build working.
With a few additional fixes in other repos, we will have substantially more working, but this'll do to at least make the bots functional. R=brettw@chromium.org BUG=431117 Review URL: https://codereview.chromium.org/702003002 Cr-Commit-Position: refs/heads/master@{#303540}
This commit is contained in:
66
BUILD.gn
66
BUILD.gn
@ -200,6 +200,12 @@ group("root") {
|
||||
]
|
||||
}
|
||||
|
||||
# TODO(GYP): Move the targets in the rest of this block that still
|
||||
# need to be made to work in the GN build to the bottom of the file
|
||||
# so that all the remaining work is located in one place in the file.
|
||||
# This block should contain only the targets that aren't actually
|
||||
# needed on Android.
|
||||
|
||||
deps -= [
|
||||
"//apps", # Needs testing.
|
||||
"//chrome/browser",
|
||||
@ -260,8 +266,36 @@ group("root") {
|
||||
]
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
# TODO(GYP): Make these work.
|
||||
#
|
||||
# TODO(GYP): Make everything below this work in the GN build.
|
||||
#
|
||||
|
||||
if (is_mac) {
|
||||
# TODO(dpranke): Need to fix the unused function errors in breakpad.
|
||||
deps -= [
|
||||
"//breakpad:symupload"
|
||||
]
|
||||
|
||||
# TODO(dpranke): These need a webrtc fix in order to build.
|
||||
deps -= [
|
||||
"//jingle:notifier",
|
||||
"//third_party/libjingle",
|
||||
"//third_party/webrtc",
|
||||
]
|
||||
|
||||
# TODO(dpranke): These depend on Blink and need Blink fixes to build.
|
||||
deps -= [
|
||||
"//cc/blink",
|
||||
"//content",
|
||||
"//content/test:test_support",
|
||||
"//media/blink",
|
||||
"//pdf",
|
||||
"//ppapi:ppapi_c",
|
||||
"//third_party/WebKit/public:all_blink",
|
||||
"//ui/app_list",
|
||||
]
|
||||
|
||||
# TODO(dpranke): These are as-yet untriaged but need at least the above.
|
||||
deps -= [
|
||||
"//apps",
|
||||
"//ash",
|
||||
@ -270,6 +304,34 @@ group("root") {
|
||||
"//chrome/common",
|
||||
"//chrome/plugin",
|
||||
"//chrome/renderer",
|
||||
"//chrome/test",
|
||||
"//chrome/utility",
|
||||
"//components:all_components",
|
||||
"//content/shell:content_shell",
|
||||
"//extensions/browser",
|
||||
"//extensions/common",
|
||||
"//extensions/common/api",
|
||||
"//extensions/renderer",
|
||||
"//remoting/client/plugin",
|
||||
"//third_party/usrsctp",
|
||||
"//ui/aura",
|
||||
"//ui/keyboard",
|
||||
"//ui/views",
|
||||
"//ui/views/controls/webview",
|
||||
"//ui/web_dialogs",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
deps -= [
|
||||
"//apps",
|
||||
"//ash",
|
||||
"//chrome/browser",
|
||||
"//chrome/browser/devtools",
|
||||
"//chrome/common",
|
||||
"//chrome/plugin",
|
||||
"//chrome/renderer",
|
||||
"//chrome/test",
|
||||
"//chrome/utility",
|
||||
"//components:all_components",
|
||||
"//cc",
|
||||
|
@ -222,7 +222,11 @@ if (current_toolchain == host_toolchain && is_mac) {
|
||||
"src/tools/mac/symupload/symupload.m",
|
||||
]
|
||||
|
||||
libs = [ "Foundaction.framework" ]
|
||||
include_dirs = [
|
||||
"src/common/mac"
|
||||
]
|
||||
|
||||
libs = [ "Foundation.framework" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -250,6 +254,11 @@ if (is_mac) {
|
||||
]
|
||||
|
||||
configs += [ ":internal_config" ]
|
||||
|
||||
# TODO(GYP): TODO(dpranke): Fix the compile for this.
|
||||
sources -= [
|
||||
"src/client/mac/handler/dynamic_images.cc",
|
||||
]
|
||||
}
|
||||
|
||||
executable("crash_inspector") {
|
||||
@ -275,9 +284,9 @@ if (is_mac) {
|
||||
]
|
||||
}
|
||||
|
||||
executable("crash_report_sender") {
|
||||
# TODO(GYP) this target has some mac_bundle_resources stuff.
|
||||
}
|
||||
# TODO(GYP) this target has some mac_bundle_resources stuff.
|
||||
# executable("crash_report_sender") {
|
||||
# }
|
||||
|
||||
config("breakpad_config") {
|
||||
include_dirs = [ "src/client/apple/Framework" ]
|
||||
|
@ -22,5 +22,12 @@ group("services") {
|
||||
"//mojo/services/html_viewer",
|
||||
"//mojo/services/network",
|
||||
]
|
||||
|
||||
# TODO(GYP): Make this work.
|
||||
if (is_mac) {
|
||||
deps -= [
|
||||
"//mojo/services/html_viewer",
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1065,7 +1065,8 @@ if (is_android || is_linux) {
|
||||
|
||||
# TODO(GYP) make this compile on Android, we need some native test deps done.
|
||||
# TODO(GYP) Also doesn't work on Windows; dependency on boringssl is wrong.
|
||||
if (!is_android && !is_win) {
|
||||
# TODO(GYP) Also doesn't work on Mac, need to figure out why not.
|
||||
if (!is_android && !is_win && !is_mac) {
|
||||
|
||||
source_set("quic_tools") {
|
||||
sources = [
|
||||
@ -1367,4 +1368,4 @@ executable("quic_server") {
|
||||
]
|
||||
}
|
||||
|
||||
} # !is_android
|
||||
} # !is_android && !is_win && !is_mac
|
||||
|
@ -7,7 +7,10 @@ group("sandbox") {
|
||||
if (is_win) {
|
||||
deps = [ "//sandbox/win:sandbox" ]
|
||||
} else if (is_mac) {
|
||||
deps = [ "//sandbox/mac:sandbox" ]
|
||||
# TODO(GYP): Make sandbox compile w/ 10.6 SDK.
|
||||
if (false) {
|
||||
deps = [ "//sandbox/mac:sandbox" ]
|
||||
}
|
||||
} else if (is_linux || is_android) {
|
||||
deps = [ "//sandbox/linux:sandbox" ]
|
||||
}
|
||||
|
4
third_party/harfbuzz-ng/BUILD.gn
vendored
4
third_party/harfbuzz-ng/BUILD.gn
vendored
@ -24,7 +24,7 @@ declare_args() {
|
||||
# update that version, we'll need to work around the duplicate symbols some
|
||||
# other way.
|
||||
use_system_harfbuzz = false
|
||||
} else {
|
||||
} else if (is_linux) {
|
||||
# Use the system harfbuzz for newer versions of pangoft, and not for older
|
||||
# ones. pangoft links to the system harfbuzz starting with 1.31.0, which
|
||||
# causes duplicate symbols when we link our own version.
|
||||
@ -32,6 +32,8 @@ declare_args() {
|
||||
pkg_config_script,
|
||||
pkg_config_args + [ "--atleast-version=1.31.0", "pangoft2" ],
|
||||
"value")
|
||||
} else {
|
||||
use_system_harfbuzz = false
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -683,6 +683,12 @@ source_set("test_support") {
|
||||
"ime/dummy_text_input_client.h",
|
||||
]
|
||||
}
|
||||
|
||||
if (!use_aura) {
|
||||
sources -= [
|
||||
"test/ui_controls_aura.cc",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
@ -865,6 +871,11 @@ test("ui_unittests") {
|
||||
}
|
||||
|
||||
if (is_mac) {
|
||||
sources -= [
|
||||
"dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
|
||||
"x/selection_requestor_unittest.cc",
|
||||
]
|
||||
|
||||
deps += [
|
||||
"//third_party/mozilla",
|
||||
#'ui_unittests_bundle', TODO(GYP)
|
||||
|
Reference in New Issue
Block a user