diff options
author | msw <msw@chromium.org> | 2015-04-16 18:52:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 01:53:16 +0000 |
commit | 69bc247eb15f6ee51521b20494267e6fe03a4762 (patch) | |
tree | 6905c52da09ca98ec95331a7e6356c383dec5b6b /BUILD.gn | |
parent | 19c5c9b47829986c46eeaee7cb9aa08bf1908e57 (diff) | |
download | chromium_src-69bc247eb15f6ee51521b20494267e6fe03a4762.zip chromium_src-69bc247eb15f6ee51521b20494267e6fe03a4762.tar.gz chromium_src-69bc247eb15f6ee51521b20494267e6fe03a4762.tar.bz2 |
Revert of Make a mojo:apptests GN meta-target, add apptests. (patchset #3 id:60001 of https://codereview.chromium.org/1050233005/)
Reason for revert:
Caused compile failures (many errors, one example below) on Mac GN bot:
http://build.chromium.org/p/chromium.mac/builders/Mac%20GN/builds/7019/steps/compile/logs/stdio
gen/mojo/services/html_viewer/blink_resource_map.h:37:58:error: no newline at end of file [-Werror,-Wnewline-eof]
#endif // MOJO_SERVICES_HTML_VIEWER_BLINK_RESOURCE_MAP_H_
Original issue's description:
> Make a mojo:apptests GN meta-target, add apptests.
>
> Add an apptest meta-target in mojo/BUILD.gn.
> Move the apptests targets specified in src/BUILD.gn.
> Add the remaining apptest targets (clipboard, VM, WM).
>
> Was limited to release, allow debug, but exclude component.
> See gn_debug compile error from including component build in PS2:
> FAILED: /b/build/slave/linux_chromium_gn/build/src/buildtools/linux64/gn --root=/b/build/slave/linux_chromium_gn/build/src -q gen //out/Debug/
> ERROR at //mojo/shell/BUILD.gn:13:1: Assertion failed.
> assert(!is_component_build)
>
> BUG=NONE
> TEST=Building mojo:apptests builds all local apptest binaries (on dbg too!).
> R=sky@chromium.org
> TBR=ben@chromium.org
>
> Committed: https://crrev.com/16b112790f541670d5f2ab97dfa70c8b89b44b1f
> Cr-Commit-Position: refs/heads/master@{#325570}
TBR=sky@chromium.org,ben@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=NONE
Review URL: https://codereview.chromium.org/1093763002
Cr-Commit-Position: refs/heads/master@{#325575}
Diffstat (limited to 'BUILD.gn')
-rw-r--r-- | BUILD.gn | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -684,7 +684,6 @@ group("gn_mojo_targets") { "//media/mojo/interfaces:interfaces_python", "//media/mojo/services:cdm_service", "//media/mojo:tests", - "//mojo:apptests", "//net/interfaces:interfaces_dart", "//net/interfaces:interfaces_python", "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests", @@ -699,8 +698,12 @@ group("gn_mojo_targets") { "//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_python", ] - if (!is_component_build) { - deps += [ "//mojo/services/html_viewer:tests" ] + if (!is_debug) { + deps += [ + "//mojo/services/html_viewer:apptests", + "//mojo/services/html_viewer:tests", + "//mojo/services/network:apptests", + ] } } } |