GN: Fix Android component build

content/app/BUILD.gn

Index: content/app/BUILD.gn
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index f68c6ded8f9f4bf2b9b15f19453e5028c08f4a40..8d70a51004ad5bf058e986a340a9b46fddccd345 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -2,6 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# TODO(GYP) enable chrome_multiple_dll support
+is_chrome_multiple_dll = false
+
 content_app_sources = [
   "android/app_jni_registrar.cc",
   "android/app_jni_registrar.h",
@@ -63,6 +66,10 @@ content_app_extra_configs = [
   "//content:content_implementation",
 ]
 
+if (!is_chrome_multiple_dll) {
+  content_app_deps += [ "//content/gpu" ]

[Avi (use Gerrit), 2014/10/24 15:24:58]

I'm not sure how to confirm this. For all the other GN files, I could see the
corresponding item in the gyp, but not this one. Can you give me a hand here?

[cjhopman, 2014/10/24 21:41:12]

Yeah, this isn't in gyp. In earlier patch sets I tried to fix this in gyp too,
but the way that content is built is more complicated there. I believe that
dependencies between content targets can only be added to the static_library
specific content target definitions (the shared_library specific ones will get a
dependency cycle if there are intra-content dependencies there). In the earliest
patch sets I did what we do in gyp, but james didn't like it (neither did I). In
gyp, we have higher levels just depend on all of content, instead of just
content_app.

This is needed because content_main_runner.cc has several references to
content_gpu stuff:
CreateInProcessGpuThread and GpuMain

+}
+
 # This includes the app sources for both the browser and child processes.
 source_set("both") {
   # Only the public target should depend on this. All other targets (even
@@ -74,9 +81,6 @@ source_set("both") {
   deps = content_app_deps
 }
 
-# TODO(GYP) enable chrome_multiple_dll support
-is_chrome_multiple_dll = false
-
 if (is_chrome_multiple_dll) {
   # It doesn't make sense to do the browser/child dll split in component mode.
   assert(!is_component_build)