GN: Enable blink and (nearly) all of content in android build

This enables all blink targets and nearly all content targets in the
android build. This produces a content shell APK, but not a fully
operational one yet. This also flips on a bunch of other targets pulled
in by deps.

R=brettw@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#294247}

1 files changed, 5 insertions, 3 deletions

diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
index 68eb059..bb2610a 100644
--- a/breakpad/BUILD.gn
+++ b/breakpad/BUILD.gn
@@ -309,7 +309,7 @@ if (is_mac) {
   }
 }
 
-if (is_linux || is_android) {
+if (is_linux) {
   executable("symupload") {
     sources = [
       "src/tools/linux/symupload/sym_upload.cc",
@@ -328,7 +328,7 @@ if (is_linux || is_android) {
   }
 }
 
-if (is_linux) {
+if (is_linux || is_android) {
   if (current_toolchain == host_toolchain) {
     # dump_syms is a host tool, so only compile it for the host system.
     executable("dump_syms") {
@@ -487,7 +487,9 @@ if (is_linux) {
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [ "//build/config/compiler:no_chromium_code" ]
   }
+}
 
+if (is_linux) {
   test("breakpad_unittests") {
     sources = [
       "linux/breakpad_googletest_includes.h",
@@ -545,7 +547,7 @@ if (is_linux) {
     if (is_android) {
       sources += [ "src/common/android/breakpad_getcontext_unittest.cc" ]
       libs = [ "log" ]
-      include_dirs = [ "src/common/android/include" ]
+      include_dirs += [ "src/common/android/include" ]
     }
   }