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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 12207072: Make installer_util_unittests build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | chrome/installer/upgrade_test.gyp » ('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 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 'installer/util/shell_util_unittest.cc', 131 'installer/util/shell_util_unittest.cc',
132 'installer/util/wmi_unittest.cc', 132 'installer/util/wmi_unittest.cc',
133 'installer/util/work_item_list_unittest.cc', 133 'installer/util/work_item_list_unittest.cc',
134 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 134 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
135 ], 135 ],
136 'msvs_settings': { 136 'msvs_settings': {
137 'VCManifestTool': { 137 'VCManifestTool': {
138 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_install er\\mini_installer.exe.manifest', 138 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_install er\\mini_installer.exe.manifest',
139 }, 139 },
140 }, 140 },
141 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
142 'msvs_disabled_warnings': [ 4267, ],
141 }, 143 },
142 { 144 {
143 'target_name': 'installer_util_strings', 145 'target_name': 'installer_util_strings',
144 'type': 'none', 146 'type': 'none',
145 'rules': [ 147 'rules': [
146 { 148 {
147 'rule_name': 'installer_util_strings', 149 'rule_name': 'installer_util_strings',
148 'extension': 'grd', 150 'extension': 'grd',
149 'variables': { 151 'variables': {
150 'create_string_rc_py' : 'installer/util/prebuild/create_string_r c.py', 152 'create_string_rc_py' : 'installer/util/prebuild/create_string_r c.py',
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1194 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1193 }, 1195 },
1194 }, { # else branding!="Chrome" 1196 }, { # else branding!="Chrome"
1195 'variables': { 1197 'variables': {
1196 'branding_dir': 'app/theme/chromium', 1198 'branding_dir': 'app/theme/chromium',
1197 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1199 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1198 }, 1200 },
1199 }], 1201 }],
1200 ], 1202 ],
1201 } 1203 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/upgrade_test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698