Skip to content

Commit

Permalink
Revert of Gets //mandoline passing gn check (patchset chromium#1 id:1…
Browse files Browse the repository at this point in the history
… of https://codereview.chromium.org/1278803006/ )

Reason for revert:
Broke android http://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/29201

Original issue's description:
> Gets //mandoline passing gn check
>
> BUG=none
> TEST=none
> R=ben@chromium.org
>
> Committed: https://crrev.com/c202fc81d0b4931cb928672e5cd226e51e501ea9
> Cr-Commit-Position: refs/heads/master@{#342890}

TBR=ben@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Review URL: https://codereview.chromium.org/1287733002

Cr-Commit-Position: refs/heads/master@{#342922}
  • Loading branch information
sky authored and Commit bot committed Aug 11, 2015
1 parent 1dc367c commit 52337f6
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 20 deletions.
2 changes: 0 additions & 2 deletions .gn
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ check_targets = [
"//ipc/*",

#"//jingle/*",
"//mandoline/*",

#"//media/*", # Lots of errors.
"mojo/*",

Expand Down
3 changes: 3 additions & 0 deletions mandoline/app/desktop/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
// found in the LICENSE file.

#include "base/at_exit.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "mandoline/app/desktop/launcher_process.h"
#include "mojo/runner/child_process.h"
#include "mojo/runner/init.h"
#include "mojo/runner/switches.h"
#include "mojo/shell/native_runner.h"

int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
Expand Down
1 change: 0 additions & 1 deletion mandoline/services/core_services/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ source_set("sources") {
"//mojo/message_pump",
"//mojo/services/tracing:lib",
"//third_party/mojo/src/mojo/public/cpp/bindings",
"//url",
]

if (!is_android) {
Expand Down
1 change: 0 additions & 1 deletion mandoline/services/updater/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ mojo_native_application("updater") {
"//mojo/application/public/cpp",
"//mojo/services/updater",
"//third_party/mojo/src/mojo/public/cpp/system",
"//url",
]
}
2 changes: 0 additions & 2 deletions mandoline/tab/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ source_set("test_support") {
]
deps = [
":tab",
"//base",
]
}

Expand All @@ -56,7 +55,6 @@ mojo_native_application("mandoline_frame_apptests") {
"//components/view_manager/public/cpp",
"//components/view_manager/public/interfaces",
"//mandoline/tab/public/interfaces",
"//mojo/application/public/cpp:sources",
"//mojo/application/public/cpp:test_support",
"//ui/mojo/geometry:interfaces",
"//ui/mojo/geometry:util",
Expand Down
1 change: 0 additions & 1 deletion mandoline/ui/aura/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,5 @@ source_set("aura") {
"//ui/gl",
"//ui/mojo/init",
"//ui/views",
"//ui/wm",
]
}
12 changes: 2 additions & 10 deletions mandoline/ui/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,20 @@ source_set("lib") {
"//components/view_manager/public/cpp",
"//mandoline/services/navigation/public/interfaces",
"//mandoline/tab",
"//mojo/application/public/cpp:sources",
"//mojo/common:common_base",
"//mojo/application/public/interfaces",
"//mojo/converters/geometry",
"//skia",
"//third_party/mojo/src/mojo/public/cpp/bindings",
"//ui/gfx/geometry",
"//ui/mojo/events:interfaces",
"//url",
]

if (is_mac || use_aura) {
sources += [
"desktop/desktop_ui.cc",
"desktop/desktop_ui.h",
]
deps += [
"//mandoline/ui/aura",
"//ui/gfx",
"//ui/views",
]
deps += [ "//mandoline/ui/aura" ]
} else {
assert(is_android)
sources += [
Expand All @@ -77,10 +71,8 @@ mojo_native_application("mandoline_browser_apptests") {
deps = [
"//base",
"//base/test:test_config",
"//components/view_manager/public/cpp",
"//mandoline/tab/public/interfaces",
"//mandoline/ui/browser:lib",
"//mojo/application/public/cpp:sources",
"//mojo/application/public/cpp:test_support",
]
}
4 changes: 1 addition & 3 deletions mandoline/ui/omnibox/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ source_set("lib") {
"//mandoline/services/navigation/public/interfaces",
"//mandoline/ui/aura",
"//mandoline/ui/browser/public/interfaces",
"//mojo/application/public/cpp:sources",
"//mojo/common",
"//mojo/application/public/interfaces",
"//mojo/converters/geometry",
"//skia",
"//third_party/mojo/src/mojo/public/cpp/bindings",
"//ui/gfx/geometry",
"//ui/mojo/events:interfaces",
"//ui/views",
]
}

0 comments on commit 52337f6

Please sign in to comment.