Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: media/BUILD.gn

Issue 1465923002: GN: Merge apk_deps and deps in test() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased on formatting change Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 "//testing/gmock", 684 "//testing/gmock",
685 "//testing/gtest", 685 "//testing/gtest",
686 "//third_party/libyuv", 686 "//third_party/libyuv",
687 "//third_party/widevine/cdm:version_h", 687 "//third_party/widevine/cdm:version_h",
688 "//ui/gfx:test_support", 688 "//ui/gfx:test_support",
689 "//url", 689 "//url",
690 ] 690 ]
691 691
692 if (is_android) { 692 if (is_android) {
693 isolate_file = "media_unittests.isolate" 693 isolate_file = "media_unittests.isolate"
694 deps += [ "//media/base/android:unittests" ] 694 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.
695 sources -= [ 695 sources -= [
696 "filters/decrypting_audio_decoder_unittest.cc", 696 "filters/decrypting_audio_decoder_unittest.cc",
697 "filters/decrypting_video_decoder_unittest.cc", 697 "filters/decrypting_video_decoder_unittest.cc",
698 ] 698 ]
699 apk_deps = [ 699 deps += [
tfarina 2015/11/20 18:56:06 merge with the above deps list?
agrieve 2015/11/20 20:06:14 Done.
700 "//media/base/android:media_java", 700 "//media/base/android:media_java",
701 "//ui/android:ui_java", 701 "//ui/android:ui_java",
702 ] 702 ]
703 } 703 }
704 704
705 # If ExternalClearKey is built, we can test CdmAdapter. 705 # If ExternalClearKey is built, we can test CdmAdapter.
706 if (enable_pepper_cdms) { 706 if (enable_pepper_cdms) {
707 sources += [ "cdm/cdm_adapter_unittest.cc" ] 707 sources += [ "cdm/cdm_adapter_unittest.cc" ]
708 deps += [ "//media/cdm/ppapi:clearkeycdm" ] 708 deps += [ "//media/cdm/ppapi:clearkeycdm" ]
709 } 709 }
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 "//media/base:test_support", 896 "//media/base:test_support",
897 "//media/test:pipeline_integration_tests", 897 "//media/test:pipeline_integration_tests",
898 "//testing/gmock", 898 "//testing/gmock",
899 "//testing/gtest", 899 "//testing/gtest",
900 "//third_party/ffmpeg", 900 "//third_party/ffmpeg",
901 "//ui/gfx:test_support", 901 "//ui/gfx:test_support",
902 "//ui/gfx/geometry", 902 "//ui/gfx/geometry",
903 ] 903 ]
904 } 904 }
905 } 905 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698