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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 203963003: Turns on use_mojo=1 for linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indentation and merge 2 trunk Created 6 years, 9 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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 'installer/linux/rpm/expected_deps_i386', 483 'installer/linux/rpm/expected_deps_i386',
484 'installer/linux/rpm/expected_deps_x86_64', 484 'installer/linux/rpm/expected_deps_x86_64',
485 ], 485 ],
486 'packaging_files_binaries': [ 486 'packaging_files_binaries': [
487 # TODO(mmoss) Any convenient way to get all the relevant build 487 # TODO(mmoss) Any convenient way to get all the relevant build
488 # files? (e.g. all locales, resources, etc.) 488 # files? (e.g. all locales, resources, etc.)
489 '<(PRODUCT_DIR)/chrome', 489 '<(PRODUCT_DIR)/chrome',
490 '<(PRODUCT_DIR)/chrome_sandbox', 490 '<(PRODUCT_DIR)/chrome_sandbox',
491 '<(PRODUCT_DIR)/libffmpegsumo.so', 491 '<(PRODUCT_DIR)/libffmpegsumo.so',
492 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', 492 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
493 '<(PRODUCT_DIR)/lib/libmojo_system.so',
493 '<(PRODUCT_DIR)/xdg-mime', 494 '<(PRODUCT_DIR)/xdg-mime',
494 '<(PRODUCT_DIR)/xdg-settings', 495 '<(PRODUCT_DIR)/xdg-settings',
495 '<(PRODUCT_DIR)/locales/en-US.pak', 496 '<(PRODUCT_DIR)/locales/en-US.pak',
496 '<(PRODUCT_DIR)/nacl_helper', 497 '<(PRODUCT_DIR)/nacl_helper',
497 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 498 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
498 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', 499 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
499 '<(PRODUCT_DIR)/PepperFlash/manifest.json', 500 '<(PRODUCT_DIR)/PepperFlash/manifest.json',
500 '<@(default_apps_list_linux_dest)', 501 '<@(default_apps_list_linux_dest)',
501 ], 502 ],
502 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 503 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1127 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1127 }, 1128 },
1128 }, { # else branding!="Chrome" 1129 }, { # else branding!="Chrome"
1129 'variables': { 1130 'variables': {
1130 'branding_dir': 'app/theme/chromium', 1131 'branding_dir': 'app/theme/chromium',
1131 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1132 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1132 }, 1133 },
1133 }], 1134 }],
1134 ], 1135 ],
1135 } 1136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698