Support desktop media pipeline on Android for GN build.

media/blink/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("//testing/test.gni")
+import("//media/media_options.gni")

[watk, 2015/10/14 21:51:42]

Order alphabetically?

[Tima Vaisburd, 2015/10/14 22:08:31]

Done.

 
 component("blink") {
   output_name = "media_blink"
 
   deps = [
     "//base",
     "//cc",
     "//cc/blink",
     "//gpu/blink",
     "//media",
@@ skipping 52 matching lines @@
     "webmediaplayer_params.cc",
     "webmediaplayer_params.h",
     "webmediaplayer_util.cc",
     "webmediaplayer_util.h",
     "webmediasource_impl.cc",
     "webmediasource_impl.h",
     "websourcebuffer_impl.cc",
     "websourcebuffer_impl.h",
   ]
 
-  if (is_android) {
+  if (is_android && !media_use_ffmpeg) {

[watk, 2015/10/14 21:51:42]

I think this would be more idiomatic gn (and clearer imo) to remove these
sources from the above source list, and conditionally add them with:

if (media_use_ffmpeg) {
  sources += [
     ...
  ]
}

[Tima Vaisburd, 2015/10/14 22:08:31]

Done.

     sources -= [
       "encrypted_media_player_support.cc",
       "encrypted_media_player_support.h",
       "webmediaplayer_impl.cc",
       "webmediaplayer_impl.h",
     ]
   }
 }
 
 test("media_blink_unittests") {
@@ skipping 42 matching lines @@
 }
 
 # TODO(GYP): Delete this after we've converted everything to GN.
 # The _run targets exist only for compatibility w/ GYP.
 group("media_blink_unittests_run") {
   testonly = true
   deps = [
     ":media_blink_unittests",
   ]
 }