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

Side by Side Diff: trunk/src/chrome/chrome_installer.gypi

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

Powered by Google App Engine
This is Rietveld 408576698