From 97b42a76b8cbe01afa8876ee4f31753d783017c1 Mon Sep 17 00:00:00 2001
From: jam <jam@chromium.org>
Date: Tue, 28 Jul 2015 11:27:32 -0700
Subject: [PATCH] Make building "mandoline" enough, instead of having to build
 "mandoline:all".

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

Cr-Commit-Position: refs/heads/master@{#340730}
---
 mandoline/BUILD.gn             |  7 +++++--
 mandoline/app/BUILD.gn         | 23 -----------------------
 mandoline/app/android/BUILD.gn |  9 +++------
 mandoline/app/desktop/BUILD.gn |  4 +++-
 4 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 mandoline/app/BUILD.gn

diff --git a/mandoline/BUILD.gn b/mandoline/BUILD.gn
index a9b396d12ffe..7574a69fd156 100644
--- a/mandoline/BUILD.gn
+++ b/mandoline/BUILD.gn
@@ -13,7 +13,11 @@ group("all") {
   ]
 
   if (!is_component_build) {
-    deps += [ "//mandoline/app" ]
+    if (is_android) {
+      deps += [ "//mandoline/app/android" ]
+    } else {
+      deps += [ "//mandoline/app/desktop" ]
+    }
   }
 }
 
@@ -27,7 +31,6 @@ group("tests") {
     deps += [ "//tools/xdisplaycheck" ]
   }
 
-  # TODO(GYP): Make this work.
   if (!is_component_build && !is_mac) {
     deps += [
       "//components/clipboard:apptests",
diff --git a/mandoline/app/BUILD.gn b/mandoline/app/BUILD.gn
deleted file mode 100644
index fd520562c173..000000000000
--- a/mandoline/app/BUILD.gn
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-group("app") {
-  deps = [
-    "//mandoline/ui",
-  ]
-
-  if (is_android) {
-    deps += [ "//mandoline/app/android" ]
-  } else {
-    deps += [ "//mandoline/app/desktop" ]
-  }
-
-  data_deps = [
-    "//mandoline/services/core_services",
-    "//mandoline/services/updater",
-    "//mandoline/ui/browser",
-    "//mojo/runner:mojo_runner",
-    "//mojo/services/updater",
-  ]
-}
diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn
index 8b7f9382ad1b..bfc35d74af69 100644
--- a/mandoline/app/android/BUILD.gn
+++ b/mandoline/app/android/BUILD.gn
@@ -54,11 +54,11 @@ copy_ex("copy_mandoline_assets") {
   deps = [
     "//components/devtools_service",
     "//components/html_viewer",
-    "//mandoline/services/core_services",
-    "//mojo/services/network",
     "//components/resource_provider",
+    "//mandoline/services/core_services",
     "//mojo/runner:bootstrap",
     "//mojo/runner:bootstrap_java",
+    "//mojo/services/network",
   ]
   sources = [
     "$root_out_dir/lib.stripped/libbootstrap$android_product_extension",
@@ -75,10 +75,7 @@ copy_ex("copy_mandoline_assets") {
   ]
 
   if (use_aura) {
-    deps += [
-      "//mandoline/ui/browser",
-      "//mandoline/ui/omnibox",
-    ]
+    deps += [ "//mandoline/ui" ]
 
     args += [
       "--files=" + rebase_path("$root_out_dir/browser", root_build_dir),
diff --git a/mandoline/app/desktop/BUILD.gn b/mandoline/app/desktop/BUILD.gn
index c97103c003ee..6cdfcf2012c0 100644
--- a/mandoline/app/desktop/BUILD.gn
+++ b/mandoline/app/desktop/BUILD.gn
@@ -27,6 +27,8 @@ executable("mandoline") {
 
   data_deps = [
     "//components/html_viewer",
-    "//mandoline/services/core_services/",
+    "//mandoline/services/core_services",
+    "//mandoline/services/updater",
+    "//mandoline/ui",
   ]
 }
-- 
2.11.4.GIT