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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 22339020: Remove chrome.pak references, build resources into resources.pak (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove chrome.pak references so 'all' builds Created 7 years, 4 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 | « chrome/chrome_dll_bundle.gypi ('k') | chrome/chrome_ios_bundle_resources.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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 'packaging_files_rpm': [ 546 'packaging_files_rpm': [
547 'installer/linux/rpm/build.sh', 547 'installer/linux/rpm/build.sh',
548 'installer/linux/rpm/chrome.spec.template', 548 'installer/linux/rpm/chrome.spec.template',
549 'installer/linux/rpm/expected_deps_i386', 549 'installer/linux/rpm/expected_deps_i386',
550 'installer/linux/rpm/expected_deps_x86_64', 550 'installer/linux/rpm/expected_deps_x86_64',
551 ], 551 ],
552 'packaging_files_binaries': [ 552 'packaging_files_binaries': [
553 # TODO(mmoss) Any convenient way to get all the relevant build 553 # TODO(mmoss) Any convenient way to get all the relevant build
554 # files? (e.g. all locales, resources, etc.) 554 # files? (e.g. all locales, resources, etc.)
555 '<(PRODUCT_DIR)/chrome', 555 '<(PRODUCT_DIR)/chrome',
556 '<(PRODUCT_DIR)/chrome.pak',
557 '<(PRODUCT_DIR)/chrome_sandbox', 556 '<(PRODUCT_DIR)/chrome_sandbox',
558 '<(PRODUCT_DIR)/libffmpegsumo.so', 557 '<(PRODUCT_DIR)/libffmpegsumo.so',
559 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', 558 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
560 '<(PRODUCT_DIR)/xdg-mime', 559 '<(PRODUCT_DIR)/xdg-mime',
561 '<(PRODUCT_DIR)/xdg-settings', 560 '<(PRODUCT_DIR)/xdg-settings',
562 '<(PRODUCT_DIR)/locales/en-US.pak', 561 '<(PRODUCT_DIR)/locales/en-US.pak',
563 '<(PRODUCT_DIR)/nacl_helper', 562 '<(PRODUCT_DIR)/nacl_helper',
564 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 563 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
565 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', 564 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
566 '<(PRODUCT_DIR)/PepperFlash/manifest.json', 565 '<(PRODUCT_DIR)/PepperFlash/manifest.json',
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1220 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1222 }, 1221 },
1223 }, { # else branding!="Chrome" 1222 }, { # else branding!="Chrome"
1224 'variables': { 1223 'variables': {
1225 'branding_dir': 'app/theme/chromium', 1224 'branding_dir': 'app/theme/chromium',
1226 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1225 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1227 }, 1226 },
1228 }], 1227 }],
1229 ], 1228 ],
1230 } 1229 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | chrome/chrome_ios_bundle_resources.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698