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

Side by Side Diff: media/BUILD.gn

Issue 1416953004: GN(Android): Fix up media_unittests to match GYP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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
« no previous file with comments | « no previous file | media/audio/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 "//skia", # Direct dependency required to inherit config. 671 "//skia", # Direct dependency required to inherit config.
672 "//testing/gmock", 672 "//testing/gmock",
673 "//testing/gtest", 673 "//testing/gtest",
674 "//third_party/widevine/cdm:version_h", 674 "//third_party/widevine/cdm:version_h",
675 "//ui/gfx:test_support", 675 "//ui/gfx:test_support",
676 "//url", 676 "//url",
677 ] 677 ]
678 678
679 if (is_android) { 679 if (is_android) {
680 isolate_file = "media_unittests.isolate" 680 isolate_file = "media_unittests.isolate"
681 deps += [ 681 deps += [ "//media/base/android:unittests" ]
682 "//media/base/android",
683 # TODO(GYP)
684 #"//testing/android/native_test:native_test_native_code"
685 ]
686 sources -= [ 682 sources -= [
687 "filters/decrypting_audio_decoder_unittest.cc", 683 "filters/decrypting_audio_decoder_unittest.cc",
688 "filters/decrypting_video_decoder_unittest.cc", 684 "filters/decrypting_video_decoder_unittest.cc",
689 ] 685 ]
686 apk_deps = [
687 "//media/base/android:media_java",
688 "//ui/android:ui_java",
689 ]
690 } 690 }
691 691
692 if (media_use_ffmpeg) { 692 if (media_use_ffmpeg) {
693 sources += [ 693 sources += [
694 "ffmpeg/ffmpeg_common_unittest.cc", 694 "ffmpeg/ffmpeg_common_unittest.cc",
695 "filters/audio_decoder_unittest.cc", 695 "filters/audio_decoder_unittest.cc",
696 "filters/ffmpeg_demuxer_unittest.cc", 696 "filters/ffmpeg_demuxer_unittest.cc",
697 "filters/ffmpeg_glue_unittest.cc", 697 "filters/ffmpeg_glue_unittest.cc",
698 ] 698 ]
699 699
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 "//media/base:test_support", 877 "//media/base:test_support",
878 "//media/test:pipeline_integration_tests", 878 "//media/test:pipeline_integration_tests",
879 "//testing/gmock", 879 "//testing/gmock",
880 "//testing/gtest", 880 "//testing/gtest",
881 "//third_party/ffmpeg", 881 "//third_party/ffmpeg",
882 "//ui/gfx/geometry", 882 "//ui/gfx/geometry",
883 "//ui/gfx:test_support", 883 "//ui/gfx:test_support",
884 ] 884 ]
885 } 885 }
886 } 886 }
OLDNEW
« no previous file with comments | « no previous file | media/audio/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698