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

Side by Side Diff: content/content_tests.gypi

Issue 12377004: Linux: Fix a target to depend on the allocator target, so it builds properly with system ld. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 949 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 'type': 'executable', 960 'type': 'executable',
961 'dependencies': [ 961 'dependencies': [
962 'content_common', 962 'content_common',
963 '../base/base.gyp:base', 963 '../base/base.gyp:base',
964 '../testing/gtest.gyp:gtest', 964 '../testing/gtest.gyp:gtest',
965 ], 965 ],
966 'sources': [ 966 'sources': [
967 'common/gpu/media/h264_bit_reader_unittest.cc', 967 'common/gpu/media/h264_bit_reader_unittest.cc',
968 'common/gpu/media/h264_parser_unittest.cc', 968 'common/gpu/media/h264_parser_unittest.cc',
969 ], 969 ],
970 'conditions': [
971 ['linux_use_tcmalloc==1', {
972 'dependencies': [
973 '../base/allocator/allocator.gyp:allocator',
974 ],
975 }],
976 ],
970 } 977 }
971 ], 978 ],
972 }], 979 }],
973 # Special target to wrap a gtest_target_type==shared_library 980 # Special target to wrap a gtest_target_type==shared_library
974 # content_unittests into an android apk for execution. 981 # content_unittests into an android apk for execution.
975 # See base.gyp for TODO(jrg)s about this strategy. 982 # See base.gyp for TODO(jrg)s about this strategy.
976 ['OS == "android" and gtest_target_type == "shared_library"', { 983 ['OS == "android" and gtest_target_type == "shared_library"', {
977 'targets': [ 984 'targets': [
978 { 985 {
979 'target_name': 'content_unittests_apk', 986 'target_name': 'content_unittests_apk',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 'additional_src_dirs': ['../content/public/android/javatests/',], 1052 'additional_src_dirs': ['../content/public/android/javatests/',],
1046 'resource_dir': '../shell_apk/res', 1053 'resource_dir': '../shell_apk/res',
1047 'is_test_apk': 1, 1054 'is_test_apk': 1,
1048 }, 1055 },
1049 'includes': [ '../build/java_apk.gypi' ], 1056 'includes': [ '../build/java_apk.gypi' ],
1050 }, 1057 },
1051 ], 1058 ],
1052 }], 1059 }],
1053 ], 1060 ],
1054 } 1061 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698