summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2014-11-10 15:51:22 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-10 23:51:42 +0000
commitcf8465db79634a28bdf66c8c518fccddf3af1ee9 (patch)
treeab9600dec63e7b05105e9f32a5c81972ef9943ab
parent7f47fa46bcc8c3a3d14cd70c9451a1b5869248f4 (diff)
downloadchromium_src-cf8465db79634a28bdf66c8c518fccddf3af1ee9.zip
chromium_src-cf8465db79634a28bdf66c8c518fccddf3af1ee9.tar.gz
chromium_src-cf8465db79634a28bdf66c8c518fccddf3af1ee9.tar.bz2
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}
-rw-r--r--BUILD.gn64
-rw-r--r--breakpad/BUILD.gn17
-rw-r--r--mojo/services/BUILD.gn7
-rw-r--r--net/BUILD.gn5
-rw-r--r--sandbox/BUILD.gn5
-rw-r--r--third_party/harfbuzz-ng/BUILD.gn4
-rw-r--r--ui/base/BUILD.gn11
7 files changed, 104 insertions, 9 deletions
diff --git a/BUILD.gn b/BUILD.gn
index da53c4e..3b155cf 100644
--- a/BUILD.gn
+++ b/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,63 @@ group("root") {
]
}
+ #
+ # 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",
+ "//chrome/browser",
+ "//chrome/browser/devtools",
+ "//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) {
- # TODO(GYP): Make these work.
deps -= [
"//apps",
"//ash",
@@ -270,6 +331,7 @@ group("root") {
"//chrome/common",
"//chrome/plugin",
"//chrome/renderer",
+ "//chrome/test",
"//chrome/utility",
"//components:all_components",
"//cc",
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
index 56a2acb..5372d2b 100644
--- a/breakpad/BUILD.gn
+++ b/breakpad/BUILD.gn
@@ -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" ]
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index aa2c54c..e0bdc4a 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -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",
+ ]
+ }
}
}
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 76e24a5..1815ea5 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -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
diff --git a/sandbox/BUILD.gn b/sandbox/BUILD.gn
index e3a8b62..647fde7 100644
--- a/sandbox/BUILD.gn
+++ b/sandbox/BUILD.gn
@@ -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" ]
}
diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
index d48eb08..195c5c8 100644
--- a/third_party/harfbuzz-ng/BUILD.gn
+++ b/third_party/harfbuzz-ng/BUILD.gn
@@ -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
}
}
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index dbef91d..37a3849 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -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)