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

Side by Side Diff: content/content_tests.gypi

Issue 10823063: Make h264_parser_unittest compilable under linux. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix up dependency. Created 8 years, 4 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 | « content/common/gpu/media/h264_parser.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 }], 712 }],
713 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 713 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
714 'include_dirs': [ 714 'include_dirs': [
715 '<(DEPTH)/third_party/libva', 715 '<(DEPTH)/third_party/libva',
716 ], 716 ],
717 }], 717 }],
718 ], 718 ],
719 }, 719 },
720 ] 720 ]
721 }], 721 }],
722 ['chromeos == 1', { 722 ['chromeos == 1 or OS == "linux"', {
723 'targets': [ 723 'targets': [
724 { 724 {
725 'target_name': 'h264_parser_unittest', 725 'target_name': 'h264_parser_unittest',
726 'type': 'executable', 726 'type': 'executable',
727 'dependencies': [ 727 'dependencies': [
728 'content_common', 728 'content_common',
729 '../base/base.gyp:base',
729 '../testing/gtest.gyp:gtest', 730 '../testing/gtest.gyp:gtest',
730 ], 731 ],
731 'sources': [ 732 'sources': [
732 'common/gpu/media/h264_parser_unittest.cc', 733 'common/gpu/media/h264_parser_unittest.cc',
733 ], 734 ],
734 } 735 }
735 ], 736 ],
736 }], 737 }],
737 # Special target to wrap a gtest_target_type==shared_library 738 # Special target to wrap a gtest_target_type==shared_library
738 # content_unittests into an android apk for execution. 739 # content_unittests into an android apk for execution.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 '-buildfile', 816 '-buildfile',
816 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 817 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
817 ] 818 ]
818 } 819 }
819 ], 820 ],
820 }, 821 },
821 ], 822 ],
822 }], 823 }],
823 ], 824 ],
824 } 825 }
OLDNEW
« no previous file with comments | « content/common/gpu/media/h264_parser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698