Add content_shell_test_apk and a several dependencies

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 1c3ee413a66dfa50e916dad67f675bdcb92fd701..8bf25d4507bb0a8a8cdec72489f2393bee1fd9e3 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -302,7 +302,7 @@ component("media") {
       "//media/base/android:video_capture_jni_headers",
     ]
     if (!is_android_webview_build) {
-      deps += [ ":media_java" ]
+      deps += [ "//media/base/android:media_java" ]
     }
   }
 
@@ -478,6 +478,23 @@ test("media_unittests") {
     "formats/webm/webm_webvtt_parser_unittest.cc",
   ]
 
+  deps = [
+    ":media",
+    ":test_support",
+    "//base/test:test_support",
+    "//media/audio:unittests",
+    "//media/audio:test_support",
+    "//media/base:unittests",
+    "//media/base:test_support",
+    "//skia",  # Direct dependency required to inherit config.
+    "//testing/gmock",
+    "//testing/gtest",
+    # TODO(dalecurtis): Port the rest of Widevine stuff.
+    "//third_party/widevine/cdm:version_h",
+    "//ui/gfx:test_support",
+    "//url",
+  ]
+
   if (!is_android) {
     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
@@ -492,11 +509,11 @@ test("media_unittests") {
       "filters/pipeline_integration_test_base.cc",
     ]
   } else {
-# TODO(ajwong): Blocked on android.
-#    deps += [
-#      ":player_android",
-#      "//testing/android:native_test_native_code"
-#    ]
+    # TODO(ajwong): Blocked on android.
+    deps += [
+      "//media/base/android",
+      #"//testing/android:native_test_native_code"
+    ]
   }
 
   if (cpu_arch != "arm" && is_chromeos && use_x11) {
@@ -557,22 +574,6 @@ test("media_unittests") {
 #            }],
 #          ],
 #        }],
-  deps = [
-    ":media",
-    ":test_support",
-    "//base/test:test_support",
-    "//media/audio:unittests",
-    "//media/audio:test_support",
-    "//media/base:unittests",
-    "//media/base:test_support",
-    "//skia",  # Direct dependency required to inherit config.
-    "//testing/gmock",
-    "//testing/gtest",
-    # TODO(dalecurtis): Port the rest of Widevine stuff.
-    "//third_party/widevine/cdm:version_h",
-    "//ui/gfx:test_support",
-    "//url",
-  ]
   if (media_use_ffmpeg) {
     deps += [
       "//third_party/ffmpeg",  # Direct dependency required to inherit config.
@@ -728,23 +729,3 @@ if (use_x11) {
     ]
   }
 }
-
-if (is_android) {
-  import("//build/config/android/rules.gni")
-  android_library("media_java") {
-    srcjar_deps = [
-      ":media_android_imageformat_list",
-    ]
-    java_files = []
-  }
-
-  java_cpp_template("media_android_imageformat_list") {
-    sources = [
-      "base/android/java/src/org/chromium/media/ImageFormat.template",
-    ]
-    inputs = [
-      "video/capture/android/imageformat_list.h"
-    ]
-    package_name = "org/chromium/media"
-  }
-}