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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 9968033: Make disable_nacl=1 work again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 2150 matching lines...) Expand 10 before | Expand all | Expand 10 after
2161 'conditions': [ 2161 'conditions': [
2162 ['enable_one_click_signin==0', { 2162 ['enable_one_click_signin==0', {
2163 'sources!': [ 2163 'sources!': [
2164 'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm', 2164 'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
2165 'browser/ui/cocoa/one_click_signin_dialog_controller_unittest.mm', 2165 'browser/ui/cocoa/one_click_signin_dialog_controller_unittest.mm',
2166 'browser/ui/gtk/one_click_signin_dialog_gtk_unittest.cc', 2166 'browser/ui/gtk/one_click_signin_dialog_gtk_unittest.cc',
2167 ] 2167 ]
2168 }], 2168 }],
2169 ['disable_nacl==1', { 2169 ['disable_nacl==1', {
2170 'sources!':[ 2170 'sources!':[
2171 'nacl/nacl_ipc_adapter_unittest.cc',
2171 'nacl/nacl_validation_query_unittest.cc', 2172 'nacl/nacl_validation_query_unittest.cc',
2172 ], 2173 ],
2173 }], 2174 }],
2174 ['target_arch!="arm"', { 2175 ['target_arch!="arm"', {
2175 'dependencies': [ 2176 'dependencies': [
2176 # build time dependency. 2177 # build time dependency.
2177 '../v8/tools/gyp/v8.gyp:v8_shell#host', 2178 '../v8/tools/gyp/v8.gyp:v8_shell#host',
2178 ], 2179 ],
2179 }], 2180 }],
2180 ['use_aura==1', { 2181 ['use_aura==1', {
(...skipping 2482 matching lines...) Expand 10 before | Expand all | Expand 10 after
4663 # Use outputs of this action as inputs for the main target build. 4664 # Use outputs of this action as inputs for the main target build.
4664 # Seems as a misnomer but makes this happy on Linux (scons). 4665 # Seems as a misnomer but makes this happy on Linux (scons).
4665 'process_outputs_as_sources': 1, 4666 'process_outputs_as_sources': 1,
4666 }, 4667 },
4667 ], # 'actions' 4668 ], # 'actions'
4668 }, 4669 },
4669 ] 4670 ]
4670 }], # 'coverage!=0' 4671 }], # 'coverage!=0'
4671 ], # 'conditions' 4672 ], # 'conditions'
4672 } 4673 }
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