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

Side by Side Diff: media/BUILD.gn

Issue 1071573003: [Android] Move testing/android/ to testing/android/native_test/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing errant commit Created 5 years, 8 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 | « gpu/BUILD.gn ('k') | remoting/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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 "//testing/gtest", 618 "//testing/gtest",
619 "//third_party/widevine/cdm:version_h", 619 "//third_party/widevine/cdm:version_h",
620 "//ui/gfx:test_support", 620 "//ui/gfx:test_support",
621 "//url", 621 "//url",
622 ] 622 ]
623 623
624 if (is_android) { 624 if (is_android) {
625 deps += [ 625 deps += [
626 "//media/base/android", 626 "//media/base/android",
627 # TODO(GYP) 627 # TODO(GYP)
628 #"//testing/android:native_test_native_code" 628 #"//testing/android/native_test:native_test_native_code"
629 ] 629 ]
630 } 630 }
631 631
632 if (media_use_ffmpeg) { 632 if (media_use_ffmpeg) {
633 sources += [ 633 sources += [
634 "ffmpeg/ffmpeg_common_unittest.cc", 634 "ffmpeg/ffmpeg_common_unittest.cc",
635 "filters/audio_decoder_unittest.cc", 635 "filters/audio_decoder_unittest.cc",
636 "filters/audio_file_reader_unittest.cc", 636 "filters/audio_file_reader_unittest.cc",
637 "filters/blocking_url_protocol_unittest.cc", 637 "filters/blocking_url_protocol_unittest.cc",
638 "filters/ffmpeg_demuxer_unittest.cc", 638 "filters/ffmpeg_demuxer_unittest.cc",
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 ":media", 816 ":media",
817 ":shared_memory_support", 817 ":shared_memory_support",
818 "//base", 818 "//base",
819 "//tools/xdisplaycheck", 819 "//tools/xdisplaycheck",
820 "//ui/gl", 820 "//ui/gl",
821 "//ui/gfx", 821 "//ui/gfx",
822 "//ui/gfx/geometry", 822 "//ui/gfx/geometry",
823 ] 823 ]
824 } 824 }
825 } 825 }
OLDNEW
« no previous file with comments | « gpu/BUILD.gn ('k') | remoting/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698