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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 10399041: Make setup.exe compatible with the component build (2nd try). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use a genexp+str.find() to find the insert_index Created 8 years, 7 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 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 7 'lastchange_path': '<(DEPTH)/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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 '--output_dir=<(PRODUCT_DIR)', 317 '--output_dir=<(PRODUCT_DIR)',
318 '--input_file=<(RULE_INPUT_PATH)', 318 '--input_file=<(RULE_INPUT_PATH)',
319 '--header_output_dir=<(INTERMEDIATE_DIR)', 319 '--header_output_dir=<(INTERMEDIATE_DIR)',
320 # TODO(sgk): may just use environment variables 320 # TODO(sgk): may just use environment variables
321 #'--distribution=$(CHROMIUM_BUILD)', 321 #'--distribution=$(CHROMIUM_BUILD)',
322 '--distribution=_google_chrome', 322 '--distribution=_google_chrome',
323 ], 323 ],
324 }, 324 },
325 ], 325 ],
326 'conditions': [ 326 'conditions': [
327 ['component == "shared_library"', {
328 'msvs_settings': {
329 'VCManifestTool': {
330 'EmbedManifest': 'false',
331 },
332 },
333 }],
327 # TODO(mark): <(branding_dir) should be defined by the 334 # TODO(mark): <(branding_dir) should be defined by the
328 # global condition block at the bottom of the file, but 335 # global condition block at the bottom of the file, but
329 # this doesn't work due to the following issue: 336 # this doesn't work due to the following issue:
330 # 337 #
331 # http://code.google.com/p/gyp/issues/detail?id=22 338 # http://code.google.com/p/gyp/issues/detail?id=22
332 # 339 #
333 # Remove this block once the above issue is fixed. 340 # Remove this block once the above issue is fixed.
334 [ 'branding == "Chrome"', { 341 [ 'branding == "Chrome"', {
335 'variables': { 342 'variables': {
336 'branding_dir': 'app/theme/google_chrome', 343 'branding_dir': 'app/theme/google_chrome',
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 'variables': { 981 'variables': {
975 'branding_dir': 'app/theme/google_chrome', 982 'branding_dir': 'app/theme/google_chrome',
976 }, 983 },
977 }, { # else branding!="Chrome" 984 }, { # else branding!="Chrome"
978 'variables': { 985 'variables': {
979 'branding_dir': 'app/theme/chromium', 986 'branding_dir': 'app/theme/chromium',
980 }, 987 },
981 }], 988 }],
982 ], 989 ],
983 } 990 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698