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

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: remove setup change 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
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/installer/linux/common/installer.include » ('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 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 ['internal_pdf', { 538 ['internal_pdf', {
539 'packaging_files_binaries': [ 539 'packaging_files_binaries': [
540 '<(PRODUCT_DIR)/libpdf.so', 540 '<(PRODUCT_DIR)/libpdf.so',
541 ], 541 ],
542 }], 542 }],
543 ['libpeer_target_type!="static_library"', { 543 ['libpeer_target_type!="static_library"', {
544 'packaging_files_binaries': [ 544 'packaging_files_binaries': [
545 '<(PRODUCT_DIR)/lib/libpeerconnection.so', 545 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
546 ], 546 ],
547 }], 547 }],
548 ['use_mojo==1', {
549 'packaging_files_binaries': [
550 '<(PRODUCT_DIR)/lib/libmojo_system.so',
551 ],
552 }],
548 ], 553 ],
549 }, 554 },
550 'targets': [ 555 'targets': [
551 { 556 {
552 'target_name': 'linux_installer_configs', 557 'target_name': 'linux_installer_configs',
553 'type': 'none', 558 'type': 'none',
554 # Add these files to the build output so the build archives will be 559 # Add these files to the build output so the build archives will be
555 # "hermetic" for packaging. This is only for branding="Chrome" since 560 # "hermetic" for packaging. This is only for branding="Chrome" since
556 # we only create packages for official builds. 561 # we only create packages for official builds.
557 'copies': [ 562 'copies': [
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1131 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1127 }, 1132 },
1128 }, { # else branding!="Chrome" 1133 }, { # else branding!="Chrome"
1129 'variables': { 1134 'variables': {
1130 'branding_dir': 'app/theme/chromium', 1135 'branding_dir': 'app/theme/chromium',
1131 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1136 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1132 }, 1137 },
1133 }], 1138 }],
1134 ], 1139 ],
1135 } 1140 }
OLDNEW
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/installer/linux/common/installer.include » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698