Revert 282780 because it broke the android-gn build.

trunk/src/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/arm.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 
 # These variables need to be args.
 
@@ skipping 13 matching lines @@
 if (is_android) {
   # Android doesn't use ffmpeg or libvpx.
   media_use_ffmpeg = false
   media_use_libvpx = false
 }
 
 # TODO(ajwong): how to disable embedded?
 # Original conditional: (OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1
 use_alsa = false
 use_pulseaudio = false
-if (is_posix && !is_android) {
+if (is_posix) {
   use_alsa = true
   if (!use_cras) {
     use_pulseaudio = true
   }
 }
 
 # TODO(ajwong): is_openbsd should be a platform define.
 is_openbsd = false
 
 # TODO(ajwong): This should be branding controlled?
@@ skipping 543 matching lines @@
   } else {
     sources += [
       "audio/android/audio_manager_android.cc",
       "audio/android/audio_manager_android.h",
       "base/android/demuxer_android.h",
       "base/android/demuxer_stream_player_params.cc",
       "base/android/demuxer_stream_player_params.h",
       "base/android/media_player_manager.h",
       "base/android/media_resource_getter.cc",
       "base/android/media_resource_getter.h",
+      "base/media.cc",
+      "base/media.h",
       "base/media_stub.cc",
       "midi/midi_manager_android.cc",
       "midi/usb_midi_device_android.cc",
       "midi/usb_midi_device_android.h",
       "midi/usb_midi_device_factory_android.cc",
       "midi/usb_midi_device_factory_android.h",
       "video/capture/android/video_capture_device_android.cc",
       "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",
     ]
     defines += [ "DISABLE_USER_INPUT_MONITOR" ]
 # TODO(ajwong): Fix for android.
 #    deps += [
 #        ":media_android_jni_headers",
 #        ":player_android",
 #        ":video_capture_android_jni_headers",
 #    ]
 #    if (!android_webview_build) {
 #      deps += [ ":media_java" ]
 #    }
   }
 
   if (is_chromeos) {
     # A simple WebM encoder for animated avatars on ChromeOS.
-    sources += [
+    sources += [ 
       "formats/webm/chromeos/ebml_writer.cc",
       "formats/webm/chromeos/ebml_writer.h",
       "formats/webm/chromeos/webm_encoder.cc",
       "formats/webm/chromeos/webm_encoder.h",
     ]
     deps += [
       "//third_party/libvpx",
       "//third_party/libyuv"
     ]
     # For VaapiVideoEncodeAccelerator.
@@ skipping 645 matching lines @@
     "base/channel_layout.h",
     "base/limits.h",
     "base/media_export.h",
     "base/vector_math.cc",
     "base/vector_math.h",
   ]
   configs += [ ":media_config" ]
   deps = [ "//base" ]
 }
 
-if (media_use_ffmpeg) {
-  test("ffmpeg_unittests") {
-    sources = [ "ffmpeg/ffmpeg_unittest.cc" ]
+test("ffmpeg_unittests") {
+  sources = [ "ffmpeg/ffmpeg_unittest.cc" ]
 
-    deps = [
-       ":media",
-       ":media_test_support",
-       "//base",
-       "//base:i18n",
-       "//base/test:test_support",
-       "//testing/gtest",
-       "//third_party/ffmpeg",
-       "//ui/gfx:gfx_test_support",
-    ]
-  }
+  deps = [
+     ":media",
+     ":media_test_support",
+     "//base",
+     "//base:i18n",
+     "//base/test:test_support",
+     "//testing/gtest",
+     "//third_party/ffmpeg",
+     "//ui/gfx:gfx_test_support",
+  ]
+}
 
-  test("ffmpeg_regression_tests") {
-    sources = [
-      "base/run_all_unittests.cc",
-      "ffmpeg/ffmpeg_regression_tests.cc",
-      "filters/pipeline_integration_test_base.cc",
-    ]
-    configs += [ ":media_config" ]
-    deps = [
-      ":media",
-      ":media_test_support",
-      "//base/test:test_support",
-      "//testing/gmock",
-      "//testing/gtest",
-      "//third_party/ffmpeg",
-      "//ui/gfx/geometry",
-      "//ui/gfx:gfx_test_support",
-    ]
-  # 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',
-  #              ],
-  #            }],
-  #          ],
-  #        }],
-  }
+test("ffmpeg_regression_tests") {
+  sources = [
+    "base/run_all_unittests.cc",
+    "ffmpeg/ffmpeg_regression_tests.cc",
+    "filters/pipeline_integration_test_base.cc",
+  ]
+  configs += [ ":media_config" ]
+  deps = [
+    ":media",
+    ":media_test_support",
+    "//base/test:test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ffmpeg",
+    "//ui/gfx/geometry",
+    "//ui/gfx:gfx_test_support",
+  ]
+# 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',
+#              ],
+#            }],
+#          ],
+#        }],
 }
 
 if (use_x11) {
   executable("player_x11") {
     sources = [
       "tools/player_x11/data_source_logger.cc",
       "tools/player_x11/data_source_logger.h",
       "tools/player_x11/gl_video_renderer.cc",
       "tools/player_x11/gl_video_renderer.h",
       "tools/player_x11/player_x11.cc",
@@ skipping 10 matching lines @@
     deps = [
       ":media",
       ":shared_memory_support",
       "//base",
       "//ui/gl",
       "//ui/gfx",
       "//ui/gfx/geometry",
     ]
   }
 }