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 e548b5dc64e3a5d5baa37874aec2e417f3e60fc1..0917cd7c813aabced0e0a11bbabec099a48c795f 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -298,7 +298,7 @@ component("media") {
       "//media/base/android:video_capture_jni_headers",
     ]
     if (!is_android_webview_build) {
-      deps += [ ":media_java" ]
+      deps += [ "//media/base/android:media_java" ]
     }
   }
 
@@ -477,6 +477,33 @@ 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.

[brettw, 2014/09/08 23:35:23]

I think you can remove this comment (this matches the gyp build as far as I can
tell).

[cjhopman, 2014/09/09 00:26:18]

Done.

+    "//third_party/widevine/cdm:version_h",
+    "//ui/gfx:test_support",
+    "//url",
+  ]
+# TODO(ajwong): This was in the original gyp, but it seems silly.

[brettw, 2014/09/08 23:35:23]

Can you delete this comment and just add "//base/allocator" to the deps.

[cjhopman, 2014/09/09 00:26:18]

Done.

+#        ['os_posix==1 and OS!="mac"', {
+#          'conditions': [
+#            ['use_allocator!="none"', {
+#              'dependencies': [
+#                '../base/allocator/allocator.gyp:allocator',
+#              ],
+#            }],
+#          ],
+#        }],
+
   if (!is_android) {

[brettw, 2014/09/08 23:35:22]

Would you mind switching this, so it says if (is_android) { below code } else {
above code }. I think that's much more readable.

[cjhopman, 2014/09/09 00:26:18]

Done.

     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
@@ -491,11 +518,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"

[brettw, 2014/09/08 23:35:22]

Should this have a TODO(GYP)?

[cjhopman, 2014/09/09 00:26:18]

Done.

+    ]
   }
 
   if (cpu_arch != "arm" && is_chromeos && use_x11) {
@@ -546,32 +573,6 @@ test("media_unittests") {
 
   configs += [ ":media_config" ]
 
-# TODO(ajwong): This was in the original gyp, but it seems silly.
-#        ['os_posix==1 and OS!="mac"', {
-#          'conditions': [
-#            ['use_allocator!="none"', {
-#              'dependencies': [
-#                '../base/allocator/allocator.gyp:allocator',
-#              ],
-#            }],
-#          ],
-#        }],
-  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.
@@ -727,23 +728,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"
-  }
-}