Add content_shell_test_apk and a several dependencies

media/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/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
 
@@ skipping 280 matching lines @@
       "video/capture/android/video_capture_device_android.h",
       "video/capture/android/video_capture_device_factory_android.cc",
       "video/capture/android/video_capture_device_factory_android.h",
     ]
     deps += [
       "//media/base/android",
       "//media/base/android:media_jni_headers",
       "//media/base/android:video_capture_jni_headers",
     ]
     if (!is_android_webview_build) {
-      deps += [ ":media_java" ]
+      deps += [ "//media/base/android:media_java" ]
     }
   }
 
   if (use_alsa) {
     libs += [ "asound" ]
     defines += [ "USE_ALSA" ]
     sources += [
       "midi/midi_manager_alsa.cc",
       "midi/midi_manager_alsa.h",
     ]
@@ skipping 158 matching lines @@
     "formats/webm/cluster_builder.h",
     "formats/webm/tracks_builder.cc",
     "formats/webm/tracks_builder.h",
     "formats/webm/webm_cluster_parser_unittest.cc",
     "formats/webm/webm_content_encodings_client_unittest.cc",
     "formats/webm/webm_parser_unittest.cc",
     "formats/webm/webm_tracks_parser_unittest.cc",
     "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",
       "filters/audio_decoder_unittest.cc",
       "filters/audio_file_reader_unittest.cc",
       "filters/blocking_url_protocol_unittest.cc",
       "filters/ffmpeg_demuxer_unittest.cc",
       "filters/ffmpeg_glue_unittest.cc",
       "filters/ffmpeg_video_decoder_unittest.cc",
       "filters/in_memory_url_protocol_unittest.cc",
       "filters/pipeline_integration_test.cc",
       "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) {
     sources += [ "filters/h264_bitstream_buffer_unittest.cc" ]
   }
 
   if (proprietary_codecs) {
     sources += [
       "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
       "filters/h264_to_annex_b_bitstream_converter_unittest.cc",
@@ skipping 30 matching lines @@
     ]
   }
 
 #      include_dirs += [
 #        # Needed by media_drm_bridge.cc.
 #        target_gen_dir,
 #      ],
 
   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.
     ]
   }
 }
 
 test("media_perftests") {
   sources = []
   if (media_use_ffmpeg) {
@@ skipping 135 matching lines @@
     deps = [
       ":media",
       ":shared_memory_support",
       "//base",
       "//ui/gl",
       "//ui/gfx",
       "//ui/gfx/geometry",
     ]
   }
 }
-
-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"
-  }
-}