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

Side by Side Diff: Source/testing/testing.gyp

Issue 132663004: Remove TestRunner_resources target. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | public/all.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 28 matching lines...) Expand all
39 'use_custom_freetype%': 0, 39 'use_custom_freetype%': 0,
40 }], 40 }],
41 ], 41 ],
42 }, 42 },
43 'includes': [ 43 'includes': [
44 '../../Source/build/features.gypi', 44 '../../Source/build/features.gypi',
45 '../../Source/testing/plugin/plugin.gypi', 45 '../../Source/testing/plugin/plugin.gypi',
46 ], 46 ],
47 'targets': [ 47 'targets': [
48 { 48 {
49 'target_name': 'TestRunner_resources',
50 'type': 'none',
51 'dependencies': [
52 'copy_TestNetscapePlugIn',
53 ],
54 'conditions': [
55 ['OS=="win"', {
56 'dependencies': [
57 'LayoutTestHelper',
58 ],
59 'copies': [{
60 'destination': '<(PRODUCT_DIR)',
61 'files': ['<(ahem_path)'],
62 }],
63 }],
64 ['OS=="mac"', {
65 'dependencies': [
66 'LayoutTestHelper',
67 ],
68 'all_dependent_settings': {
69 'mac_bundle_resources': [
70 '<(ahem_path)',
71 '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png' ,
72 '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCor ner.png',
73 ],
74 },
75 }],
76 # The test plugin relies on X11.
77 ['OS=="linux" and use_x11==0', {
78 'dependencies!': [
79 'copy_TestNetscapePlugIn',
80 ],
81 }],
82 ['use_x11 == 1', {
83 'dependencies': [
84 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplay check',
85 ],
86 'copies': [{
87 'destination': '<(PRODUCT_DIR)',
88 'files': [
89 '<(ahem_path)',
90 '<(source_dir)/testing/data/fonts/fonts.conf',
91 ]
92 }],
93 }],
94 ['OS=="android"', {
95 'dependencies!': [
96 'copy_TestNetscapePlugIn',
97 ],
98 'copies': [{
99 'destination': '<(PRODUCT_DIR)',
100 'files': [
101 '<(ahem_path)',
102 '<(source_dir)/testing/data/fonts/android_main_fonts .xml',
103 '<(source_dir)/testing/data/fonts/android_fallback_f onts.xml',
104 ]
105 }],
106 }],
107 ],
108 },
109 {
110 'target_name': 'TestNetscapePlugIn', 49 'target_name': 'TestNetscapePlugIn',
111 'type': 'loadable_module', 50 'type': 'loadable_module',
112 'sources': [ '<@(test_plugin_files)' ], 51 'sources': [ '<@(test_plugin_files)' ],
113 'dependencies': [ 52 'dependencies': [
114 '../config.gyp:unittest_config', 53 '../config.gyp:unittest_config',
115 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 54 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
116 ], 55 ],
117 'include_dirs': [ 56 'include_dirs': [
118 '<(DEPTH)', 57 '<(DEPTH)',
119 '<(source_dir)/testing/plugin/', 58 '<(source_dir)/testing/plugin/',
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 'cflags_cc': ['-Wno-c++0x-compat'], 150 'cflags_cc': ['-Wno-c++0x-compat'],
212 }, 151 },
213 }], 152 }],
214 ['clang==1', { 153 ['clang==1', {
215 'target_defaults': { 154 'target_defaults': {
216 # FIXME: Add -Wglobal-constructors after fixing existing bugs. 155 # FIXME: Add -Wglobal-constructors after fixing existing bugs.
217 }, 156 },
218 }], 157 }],
219 ], # conditions 158 ], # conditions
220 } 159 }
OLDNEW
« no previous file with comments | « no previous file | public/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698