Add content_shell_apk target (and a bunch of its dependencies)

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")
-import("//tools/grit/repack.gni")
 if (is_android) {
   import("//build/config/android/config.gni")
 }
 
 declare_args() {
   content_shell_product_name = "Content Shell"
 
   # The "19" is so that sites that sniff for version think that this is
   # something reasonably current; the "77.34.5" is a hint that this isn't a
   # standard Chrome.
@@ skipping 235 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' ]  TODO(GYP)
-    #deps -= [ 'copy_test_netscape_plugin' ]  TODO(GYP)
+    deps += [ ":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",
@@ skipping 182 matching lines @@
   }
 
   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)",
     ]
   }
 }