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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 381123004: build fix after r282379 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 'installer/linux/common/rpmrepo.cron', 433 'installer/linux/common/rpmrepo.cron',
434 'installer/linux/common/symlinks.include', 434 'installer/linux/common/symlinks.include',
435 'installer/linux/common/variables.include', 435 'installer/linux/common/variables.include',
436 'installer/linux/common/wrapper', 436 'installer/linux/common/wrapper',
437 ], 437 ],
438 'packaging_files_deb': [ 438 'packaging_files_deb': [
439 'installer/linux/debian/build.sh', 439 'installer/linux/debian/build.sh',
440 'installer/linux/debian/changelog.template', 440 'installer/linux/debian/changelog.template',
441 'installer/linux/debian/control.template', 441 'installer/linux/debian/control.template',
442 'installer/linux/debian/debian.menu', 442 'installer/linux/debian/debian.menu',
443 'installer/linux/debian/expected_deps', 443 'installer/linux/debian/expected_deps_ia32',
444 'installer/linux/debian/expected_deps_x64',
444 'installer/linux/debian/postinst', 445 'installer/linux/debian/postinst',
445 'installer/linux/debian/postrm', 446 'installer/linux/debian/postrm',
446 'installer/linux/debian/prerm', 447 'installer/linux/debian/prerm',
447 ], 448 ],
448 'packaging_files_rpm': [ 449 'packaging_files_rpm': [
449 'installer/linux/rpm/build.sh', 450 'installer/linux/rpm/build.sh',
450 'installer/linux/rpm/chrome.spec.template', 451 'installer/linux/rpm/chrome.spec.template',
451 'installer/linux/rpm/expected_deps_i386', 452 'installer/linux/rpm/expected_deps_i386',
452 'installer/linux/rpm/expected_deps_x86_64', 453 'installer/linux/rpm/expected_deps_x86_64',
453 ], 454 ],
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1091 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1091 }, 1092 },
1092 }, { # else branding!="Chrome" 1093 }, { # else branding!="Chrome"
1093 'variables': { 1094 'variables': {
1094 'branding_dir': 'app/theme/chromium', 1095 'branding_dir': 'app/theme/chromium',
1095 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1096 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1096 }, 1097 },
1097 }], 1098 }],
1098 ], 1099 ],
1099 } 1100 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698