Support desktop media pipeline on Android for GN build.

media/blink/BUILD.gn

Index: media/blink/BUILD.gn
diff --git a/media/blink/BUILD.gn b/media/blink/BUILD.gn
index a805c42fca8cf76c8de93a73bf0b66013c72dc3a..ec7538d0d1ee855f88c692ed3ebab24665f6e479 100644
--- a/media/blink/BUILD.gn
+++ b/media/blink/BUILD.gn
@@ -3,6 +3,7 @@
 # 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"
@@ -75,7 +76,7 @@ component("blink") {
     "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",