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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 23579003: GCAPI should append to the existing experiment_labels instead of clobbering them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review++ Created 7 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/chrome_common.gypi ('k') | chrome/chrome_tests_unit.gypi » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 'installer_util', 58 'installer_util',
59 '../base/base.gyp:base', 59 '../base/base.gyp:base',
60 '../base/base.gyp:test_support_base', 60 '../base/base.gyp:test_support_base',
61 '../testing/gtest.gyp:gtest', 61 '../testing/gtest.gyp:gtest',
62 ], 62 ],
63 'include_dirs': [ 63 'include_dirs': [
64 '..', 64 '..',
65 ], 65 ],
66 'sources': [ 66 'sources': [
67 'installer/gcapi/gcapi_last_run_test.cc', 67 'installer/gcapi/gcapi_last_run_test.cc',
68 'installer/gcapi/gcapi_omaha_experiment_test.cc',
68 'installer/gcapi/gcapi_reactivation_test.cc', 69 'installer/gcapi/gcapi_reactivation_test.cc',
70 'installer/gcapi/gcapi_test_registry_overrider.cc',
71 'installer/gcapi/gcapi_test_registry_overrider.h',
69 'installer/gcapi/gcapi_test.cc', 72 'installer/gcapi/gcapi_test.cc',
70 'installer/gcapi/gcapi_test.rc', 73 'installer/gcapi/gcapi_test.rc',
71 'installer/gcapi/resource.h', 74 'installer/gcapi/resource.h',
72 ], 75 ],
73 }, 76 },
74 { 77 {
75 'target_name': 'installer_util_unittests', 78 'target_name': 'installer_util_unittests',
76 'type': 'executable', 79 'type': 'executable',
77 'dependencies': [ 80 'dependencies': [
78 'installer_util', 81 'installer_util',
(...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1224 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1222 }, 1225 },
1223 }, { # else branding!="Chrome" 1226 }, { # else branding!="Chrome"
1224 'variables': { 1227 'variables': {
1225 'branding_dir': 'app/theme/chromium', 1228 'branding_dir': 'app/theme/chromium',
1226 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1229 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1227 }, 1230 },
1228 }], 1231 }],
1229 ], 1232 ],
1230 } 1233 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698