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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 9949033: Removed access to prefs that does not work on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a flag enable_promo_resource_service 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
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 2117 matching lines...) Expand 10 before | Expand all | Expand 10 after
2128 ['exclude', '^browser/background/'], 2128 ['exclude', '^browser/background/'],
2129 ], 2129 ],
2130 }], 2130 }],
2131 ['enable_one_click_signin==0', { 2131 ['enable_one_click_signin==0', {
2132 'sources!': [ 2132 'sources!': [
2133 'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm', 2133 'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
2134 'browser/ui/cocoa/one_click_signin_dialog_controller_unittest.mm', 2134 'browser/ui/cocoa/one_click_signin_dialog_controller_unittest.mm',
2135 'browser/ui/gtk/one_click_signin_dialog_gtk_unittest.cc', 2135 'browser/ui/gtk/one_click_signin_dialog_gtk_unittest.cc',
2136 ] 2136 ]
2137 }], 2137 }],
2138 ['enable_promo_resource_service==0', {
2139 'sources/': [
2140 ['exclude', '^browser/web_resource/promo_resource_service'],
2141 ],
2142 }],
2138 ['disable_nacl==1', { 2143 ['disable_nacl==1', {
2139 'sources!':[ 2144 'sources!':[
2140 'nacl/nacl_ipc_adapter_unittest.cc', 2145 'nacl/nacl_ipc_adapter_unittest.cc',
2141 'nacl/nacl_validation_query_unittest.cc', 2146 'nacl/nacl_validation_query_unittest.cc',
2142 ], 2147 ],
2143 }], 2148 }],
2144 ['target_arch!="arm"', { 2149 ['target_arch!="arm"', {
2145 'dependencies': [ 2150 'dependencies': [
2146 # build time dependency. 2151 # build time dependency.
2147 '../v8/tools/gyp/v8.gyp:v8_shell#host', 2152 '../v8/tools/gyp/v8.gyp:v8_shell#host',
(...skipping 2503 matching lines...) Expand 10 before | Expand all | Expand 10 after
4651 # Use outputs of this action as inputs for the main target build. 4656 # Use outputs of this action as inputs for the main target build.
4652 # Seems as a misnomer but makes this happy on Linux (scons). 4657 # Seems as a misnomer but makes this happy on Linux (scons).
4653 'process_outputs_as_sources': 1, 4658 'process_outputs_as_sources': 1,
4654 }, 4659 },
4655 ], # 'actions' 4660 ], # 'actions'
4656 }, 4661 },
4657 ] 4662 ]
4658 }], # 'coverage!=0' 4663 }], # 'coverage!=0'
4659 ], # 'conditions' 4664 ], # 'conditions'
4660 } 4665 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698