Rework definitions of 'gn_all' and related targets.

BUILD.gn

 # Copyright (c) 2013 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.
 
 # This is the root build file for GN. GN will start processing by loading this
 # file, and recursively load all dependencies until all dependencies are either
 # resolved or known not to exist (which will cause the build to fail). So if
 # you add a new build file, there must be some path of dependencies from this
 # file to your new one or GN won't know about it.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
 }
 
 declare_args() {
   # A list of extra dependencies to add to the root target. This allows a
   # checkout to add additional targets without explicitly changing any checked-
   # in files.
   root_extra_deps = []
 }
 
-# The "gn_all" target should list every root target (target that
-# nothing else depends on) built by both GN and GYP. One should
-# be able to run 'ninja gn_all gn_only gn_groups' and then run
-# 'ninja' a second time and have the second ninja invocation do nothing.
+# This file defines the following three main targets:
 #
-# In addition, the "gn_all" target serves to pull in all of the other
-# build files needed for the build.
+# "both_gn_and_gyp" should list every root target (target that nothing else
+# depends on) built by GN that is also built in the GYP build.
 #
-# TODO(GYP): make sure that the above is true and there are scripts run
-# on the bots that enforce this.
+# "gn_all" should (transitively) cause everything to be built; if you run
+# 'ninja gn_all' and then 'ninja all', the second build should do no work.
+#
+# "gn_only" should list every root target that is *not* intended to be built
+# in a GYP build. Because GN has different rules for deciding what an 'all'
+# build is, this may end up including targets that are actually defined in a
+# GYP build but not dependencies of GYP's "all" (and so not actually built).
+#
+# TODO(GYP): crbug.com/481694. Make sure that the above is true and there are
+# scripts run on the bots that enforce this. Once the GYP migration is over,
+# we can collapse all of these targets as desired.
 
 group("gn_all") {
   testonly = true
 
   deps = [
+    ":both_gn_and_gyp",
+    ":gn_only",
+  ]
+}
+
+# The "both_gn_and_gyp" target should reflect every target that is built
+# in both the GN and GYP builds, and ideally it should match the
+# "both_gn_and_gyp" target in build/gn_migration.gypi line-for-line.
+#
+# TODO(GYP): Add build steps that check and enforce this on the bots.
+group("both_gn_and_gyp") {
+  testonly = true
+
+  deps = [
     "//base:base_unittests",
     "//cc:cc_unittests",
     "//chrome",
     "//chrome/test:browser_tests",
     "//chrome/test:interactive_ui_tests",
     "//chrome/test:sync_integration_tests",
     "//chrome/test:unit_tests",
     "//chrome/test/chromedriver:chromedriver_unittests",
     "//components:components_browsertests",
     "//components:components_unittests",
     "//content/shell:content_shell",
     "//content/test:content_browsertests",
     "//content/test:content_perftests",
     "//content/test:content_unittests",
     "//crypto:crypto_unittests",
     "//device:device_unittests",
     "//extensions:extensions_browsertests",
     "//extensions:extensions_unittests",
     "//google_apis/gcm:gcm_unit_tests",
     "//gpu:gpu_unittests",
     "//ipc:ipc_tests",
     "//ipc/mojo:ipc_mojo_unittests",
     "//jingle:jingle_unittests",
-    "//mandoline:mandoline_all",
     "//media:media_unittests",
     "//media/cast:cast_unittests",
     "//mojo",
     "//mojo/application",
     "//mojo/common:mojo_common_unittests",
     "//net:hpack_example_generator",
     "//net:hpack_fuzz_mutator",
     "//net:hpack_fuzz_wrapper",
     "//net:net_perftests",
     "//net:net_unittests",
@@ skipping 470 matching lines @@
       "//net:net_unittests",  # TODO(GYP)
     ]
   } else if (!is_android) {
     deps += [ "//breakpad:symupload" ]
   }
 }
 
 group("gn_only") {
   testonly = true
 
-  deps = []
+  deps = [
+    "//mandoline:mandoline_all",
+  ]
 
   if (!is_android && !is_ios) {
     deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
   }
 
   if (is_linux && !is_chromeos) {
     # TODO(GYP): Figure out if any of these should be in gn_all
     # and figure out how cross-platform they are
     deps += [
       ":gn_mojo_targets",
@@ skipping 253 matching lines @@
       "//url:url_unittests",  # PASSES 4/17/2015
 
       # TODO(GYP) installer_util_unittests
       # TODO(GYP) app_installer_unittests
       # TODO(GYP) nacl_integration
       # TODO(GYP) telemetry_perf_unittests
       # TODO(GYP) telemetry_unittests
     ]
   }
 }