GN: Merge apk_deps and deps in test() template

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/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
@@ skipping 673 matching lines @@
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/libyuv",
     "//third_party/widevine/cdm:version_h",
     "//ui/gfx:test_support",
     "//url",
   ]
 
   if (is_android) {
     isolate_file = "media_unittests.isolate"
     deps += [ "//media/base/android:unittests" ]

[tfarina, 2015/11/20 18:56:06]

I guess this should go below sources list.

[agrieve, 2015/11/20 20:06:14]

Done.

     sources -= [
       "filters/decrypting_audio_decoder_unittest.cc",
       "filters/decrypting_video_decoder_unittest.cc",
     ]
-    apk_deps = [
+    deps += [

[tfarina, 2015/11/20 18:56:06]

merge with the above deps list?

[agrieve, 2015/11/20 20:06:14]

Done.

       "//media/base/android:media_java",
       "//ui/android:ui_java",
     ]
   }
 
   # If ExternalClearKey is built, we can test CdmAdapter.
   if (enable_pepper_cdms) {
     sources += [ "cdm/cdm_adapter_unittest.cc" ]
     deps += [ "//media/cdm/ppapi:clearkeycdm" ]
   }
@@ skipping 186 matching lines @@
       "//media/base:test_support",
       "//media/test:pipeline_integration_tests",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/ffmpeg",
       "//ui/gfx:test_support",
       "//ui/gfx/geometry",
     ]
   }
 }