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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 7976045: Fix in-use updates for Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Some changes incorporated Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 'installer/setup/install_worker.cc', # Move to lib 356 'installer/setup/install_worker.cc', # Move to lib
357 'installer/setup/install_worker.h', # Move to lib 357 'installer/setup/install_worker.h', # Move to lib
358 'installer/setup/install_worker_unittest.cc', 358 'installer/setup/install_worker_unittest.cc',
359 'installer/setup/run_all_unittests.cc', 359 'installer/setup/run_all_unittests.cc',
360 'installer/setup/setup_constants.cc', # Move to lib 360 'installer/setup/setup_constants.cc', # Move to lib
361 'installer/setup/setup_constants.h', # Move to lib 361 'installer/setup/setup_constants.h', # Move to lib
362 'installer/setup/setup_unittests.rc', 362 'installer/setup/setup_unittests.rc',
363 'installer/setup/setup_unittests_resource.h', 363 'installer/setup/setup_unittests_resource.h',
364 'installer/setup/setup_util.cc', 364 'installer/setup/setup_util.cc',
365 'installer/setup/setup_util_unittest.cc', 365 'installer/setup/setup_util_unittest.cc',
366 'installer/util/installation_validation_helper.cc',
367 'installer/util/installation_validation_helper.h',
366 ], 368 ],
367 }, 369 },
368 ], 370 ],
369 }], 371 }],
370 ['OS=="linux" and branding=="Chrome"', { 372 ['OS=="linux" and branding=="Chrome"', {
371 'variables': { 373 'variables': {
372 # Always google_chrome since this only applies to branding==Chrome. 374 # Always google_chrome since this only applies to branding==Chrome.
373 'branding_dir': 'app/theme/google_chrome', 375 'branding_dir': 'app/theme/google_chrome',
374 'version' : '<!(python <(version_py_path) -f <(DEPTH)/chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")', 376 'version' : '<!(python <(version_py_path) -f <(DEPTH)/chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
375 'revision' : '<!(python <(DEPTH)/build/util/lastchange.py --revision-onl y)', 377 'revision' : '<!(python <(DEPTH)/build/util/lastchange.py --revision-onl y)',
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 'variables': { 923 'variables': {
922 'branding_dir': 'app/theme/google_chrome', 924 'branding_dir': 'app/theme/google_chrome',
923 }, 925 },
924 }, { # else branding!="Chrome" 926 }, { # else branding!="Chrome"
925 'variables': { 927 'variables': {
926 'branding_dir': 'app/theme/chromium', 928 'branding_dir': 'app/theme/chromium',
927 }, 929 },
928 }], 930 }],
929 ], 931 ],
930 } 932 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698