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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 8429023: Add platform_app flag to manifest. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge conflict resolution. Created 9 years, 1 month 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 | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.h » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables' : { 5 'variables' : {
6 # Variables for js2gtest rules 6 # Variables for js2gtest rules
7 'gypv8sh': '../tools/gypv8sh.py', 7 'gypv8sh': '../tools/gypv8sh.py',
8 'js2gtest': 'test/base/js2gtest.js', 8 'js2gtest': 'test/base/js2gtest.js',
9 'js2gtest_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2gtest', 9 'js2gtest_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2gtest',
10 'mock_js': 'third_party/mock4js/mock4js.js', 10 'mock_js': 'third_party/mock4js/mock4js.js',
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 'test/base/chrome_render_view_host_test_harness.cc', 195 'test/base/chrome_render_view_host_test_harness.cc',
196 'test/base/chrome_render_view_host_test_harness.h', 196 'test/base/chrome_render_view_host_test_harness.h',
197 'test/base/chrome_test_suite.cc', 197 'test/base/chrome_test_suite.cc',
198 'test/base/chrome_test_suite.h', 198 'test/base/chrome_test_suite.h',
199 'test/base/in_process_browser_test.cc', 199 'test/base/in_process_browser_test.cc',
200 'test/base/in_process_browser_test.h', 200 'test/base/in_process_browser_test.h',
201 'test/base/model_test_utils.cc', 201 'test/base/model_test_utils.cc',
202 'test/base/model_test_utils.h', 202 'test/base/model_test_utils.h',
203 'test/base/profile_mock.cc', 203 'test/base/profile_mock.cc',
204 'test/base/profile_mock.h', 204 'test/base/profile_mock.h',
205 'test/base/scoped_command_line_override.cc',
206 'test/base/scoped_command_line_override.h',
205 'test/base/test_browser_window.cc', 207 'test/base/test_browser_window.cc',
206 'test/base/test_browser_window.h', 208 'test/base/test_browser_window.h',
207 'test/base/test_html_dialog_observer.cc', 209 'test/base/test_html_dialog_observer.cc',
208 'test/base/test_html_dialog_observer.h', 210 'test/base/test_html_dialog_observer.h',
209 'test/base/test_launcher_utils.cc', 211 'test/base/test_launcher_utils.cc',
210 'test/base/test_launcher_utils.h', 212 'test/base/test_launcher_utils.h',
211 'test/base/test_location_bar.cc', 213 'test/base/test_location_bar.cc',
212 'test/base/test_location_bar.h', 214 'test/base/test_location_bar.h',
213 'test/base/test_switches.cc', 215 'test/base/test_switches.cc',
214 'test/base/test_switches.h', 216 'test/base/test_switches.h',
(...skipping 4007 matching lines...) Expand 10 before | Expand all | Expand 10 after
4222 # Use outputs of this action as inputs for the main target build. 4224 # Use outputs of this action as inputs for the main target build.
4223 # Seems as a misnomer but makes this happy on Linux (scons). 4225 # Seems as a misnomer but makes this happy on Linux (scons).
4224 'process_outputs_as_sources': 1, 4226 'process_outputs_as_sources': 1,
4225 }, 4227 },
4226 ], # 'actions' 4228 ], # 'actions'
4227 }, 4229 },
4228 ] 4230 ]
4229 }], # 'coverage!=0' 4231 }], # 'coverage!=0'
4230 ], # 'conditions' 4232 ], # 'conditions'
4231 } 4233 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698