diff options
author | brettw <brettw@chromium.org> | 2015-05-05 13:41:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 20:42:11 +0000 |
commit | 355adebf1a09206f905839b5af568558c2cd059c (patch) | |
tree | 556d7f5a113248dc3900d4b750ef3ad21be5201d | |
parent | 7080a81857e6a5be8eed11942ead222e98e5b34f (diff) | |
download | chromium_src-355adebf1a09206f905839b5af568558c2cd059c.zip chromium_src-355adebf1a09206f905839b5af568558c2cd059c.tar.gz chromium_src-355adebf1a09206f905839b5af568558c2cd059c.tar.bz2 |
Make the GN Windows component build work.
With this patch the Windows GN component build builds without errors.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg
BUG=470212
Review URL: https://codereview.chromium.org/1128563003
Cr-Commit-Position: refs/heads/master@{#328397}
-rw-r--r-- | chrome/app_installer/BUILD.gn | 1 | ||||
-rw-r--r-- | chrome/installer/test/run_all_tests.cc | 2 | ||||
-rw-r--r-- | content/test/BUILD.gn | 1 | ||||
-rw-r--r-- | media/audio/BUILD.gn | 1 | ||||
-rw-r--r-- | ui/views/examples/BUILD.gn | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/chrome/app_installer/BUILD.gn b/chrome/app_installer/BUILD.gn index 9ff4409..90b15f6 100644 --- a/chrome/app_installer/BUILD.gn +++ b/chrome/app_installer/BUILD.gn @@ -17,6 +17,7 @@ executable("app_installer") { deps = [ ":util", "//base", + "//mojo/environment:chromium", ] # TODO(GYP) manifest. diff --git a/chrome/installer/test/run_all_tests.cc b/chrome/installer/test/run_all_tests.cc index ce54b2a..cb05560 100644 --- a/chrome/installer/test/run_all_tests.cc +++ b/chrome/installer/test/run_all_tests.cc @@ -5,7 +5,7 @@ #include "base/test/test_suite.h" int main(int argc, char **argv) { - TestSuite test_suite(argc, argv); + base::TestSuite test_suite(argc, argv); return test_suite.Run(); } diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index f55e1c4..4d8048e 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -657,6 +657,7 @@ if (!is_mac) { # TODO(GYP) enable on Mac once it links. "//base/allocator", "//base/test:test_support", "//content/public/common", + "//gpu/blink", "//gpu/command_buffer/common", "//testing/gtest", "//third_party/WebKit/public:blink", diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn index d2bbbd3..11d3d76 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -287,6 +287,7 @@ source_set("unittests") { ] deps = [ ":test_support", + "//media/base:test_support", "//testing/gmock", "//testing/gtest", ] diff --git a/ui/views/examples/BUILD.gn b/ui/views/examples/BUILD.gn index b908eb1..e9e4222 100644 --- a/ui/views/examples/BUILD.gn +++ b/ui/views/examples/BUILD.gn @@ -155,6 +155,7 @@ executable("views_examples_with_content_exe") { ":views_examples_with_content_lib", "//base", "//content", + "//content:startup_helper_win", "//ui/views_content_client", ] |