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

content/shell/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//tools/grit/repack.gni")
 import("//tools/grit/grit_rule.gni")
 if (is_android) {
   import("//build/config/android/config.gni")
@@ skipping 246 matching lines @@
     configs += [ "//build/config/linux:fontconfig" ]
   }
 
   if (use_x11) {
     # Some tests rely on this tool at runtime. Note: it might be better if
     # the tests that needed it had this as a dep instead of adding it here.
     datadeps = [ "//tools/xdisplaycheck" ]
   }
 
   if (is_android) {
-    deps += [ ":content_shell_jni_headers" ]
+    deps += [ "//content/shell/android:content_shell_jni_headers" ]
     #deps -= [ "copy_test_netscape_plugin" ]  TODO(GYP)
   }
 
   if (is_posix && !is_mac && (!is_android || !is_android_webview_build)) {
     deps += [ "//components/crash/browser" ]
   }
 
   if (use_aura) {
     deps += [
       "//ui/aura",
       "//ui/aura:test_support",
       "//ui/events",
       "//ui/strings",
       "//ui/wm",
     ]
 
     if (toolkit_views) {
       sources += [ "browser/shell_views.cc" ]
       deps += [
         "//ui/resources",
         "//ui/views/controls/webview",
         "//ui/views",
         "//ui/views:test_support",
       ]
     } else {
       sources += [ "browser/shell_aura.cc" ]
     }
+  } else {
+    sources -= [
+      "browser/shell_platform_data_aura.cc",
+      "browser/shell_platform_data_aura.h",
+    ]
   }
 
   # The test plugin relies on X11.
   if (is_linux && !use_x11) {
     #deps -= [ 'copy_test_netscape_plugin' ]  TODO(GYP)
   }
 
   if (is_chromeos) {
     deps += [
       "//ui/wm:test_support",
@@ skipping 118 matching lines @@
 
   if (is_android) {
     output = "$root_out_dir/content_shell/assets/content_shell.pak"
   } else {
     sources += [ "$root_gen_dir/webkit/devtools_resources.pak" ]
     deps += [ "//content/browser/devtools:resources" ]
     output = "$root_out_dir/content_shell.pak"
   }
 }
 
+# TODO(GYP): Figure out what this should be on android
+if (!is_android) {
+
 executable("content_shell") {
   testonly = true
   # TODO(GYP) mac resource bundle stuff for this target.
   # TODO(GYP) Windows content shell settings:
   #  - Manifest.
   #  - RC file.
   #  - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
   sources = [
     "../app/startup_helper_win.cc",
     "app/shell_main.cc",
   ]
 
   deps = [
     ":content_shell_lib",
     ":pak",
     "//base/allocator",
-    "//third_party/mesa:osmesa",
   ]
 
   if (is_win) {
     deps += [ "//sandbox" ]
     if (!is_asan) {
       configs -= [ "//build/config/win:console" ]
       configs += [ "//build/config/win:windowed" ]
     }
   }
 
   if (is_mac) {
     # TODO(GYP) lots of stuff from GYP file here.
   }
 
-  if (!is_android || !is_android_webview_build) {
+  if (is_android && !is_android_webview_build) {
     # Some tests rely on this tool. It might be nicer if these tests relied on
     # image diff rather than having content shell depend on it.
     datadeps = [
       "//tools/imagediff($host_toolchain)",
     ]
   }
 }
+
+}