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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10783006: Removing ENABLE_PROMO_RESOURCE_SERVICE guards (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: TODO to remove kNtpCustomLogo Created 8 years, 5 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/pref_names.cc » ('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) 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 2046 matching lines...) Expand 10 before | Expand all | Expand 10 after
2057 'sources/': [ 2057 'sources/': [
2058 ['exclude', '^browser/background/'], 2058 ['exclude', '^browser/background/'],
2059 ], 2059 ],
2060 }], 2060 }],
2061 ['enable_one_click_signin==0', { 2061 ['enable_one_click_signin==0', {
2062 'sources!': [ 2062 'sources!': [
2063 'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm', 2063 'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
2064 'browser/ui/sync/one_click_signin_helper_unittest.cc', 2064 'browser/ui/sync/one_click_signin_helper_unittest.cc',
2065 ] 2065 ]
2066 }], 2066 }],
2067 ['enable_promo_resource_service==0', {
2068 'sources/': [
2069 ['exclude', '^browser/web_resource/promo_resource_service'],
2070 ],
2071 }],
2072 ['disable_nacl==1', { 2067 ['disable_nacl==1', {
2073 'sources!':[ 2068 'sources!':[
2074 'browser/nacl_host/nacl_validation_cache_unittest.cc', 2069 'browser/nacl_host/nacl_validation_cache_unittest.cc',
2075 'nacl/nacl_ipc_adapter_unittest.cc', 2070 'nacl/nacl_ipc_adapter_unittest.cc',
2076 'nacl/nacl_validation_query_unittest.cc', 2071 'nacl/nacl_validation_query_unittest.cc',
2077 ], 2072 ],
2078 }], 2073 }],
2079 ['target_arch!="arm"', { 2074 ['target_arch!="arm"', {
2080 'dependencies': [ 2075 'dependencies': [
2081 # build time dependency. 2076 # build time dependency.
(...skipping 2617 matching lines...) Expand 10 before | Expand all | Expand 10 after
4699 'input_jars_paths': [ 4694 'input_jars_paths': [
4700 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 4695 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
4701 ], 4696 ],
4702 }, 4697 },
4703 'includes': [ '../build/apk_test.gypi' ], 4698 'includes': [ '../build/apk_test.gypi' ],
4704 }, 4699 },
4705 ], 4700 ],
4706 }], 4701 }],
4707 ], # 'conditions' 4702 ], # 'conditions'
4708 } 4703 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698