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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 14084004: Use <(SHARED_LIB_DIR) instead of <(PRODUCT_DIR)/lib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 'deb_arch': 'arm', 583 'deb_arch': 'arm',
584 'rpm_arch': 'arm', 584 'rpm_arch': 'arm',
585 }], 585 }],
586 ['internal_pdf', { 586 ['internal_pdf', {
587 'packaging_files_binaries': [ 587 'packaging_files_binaries': [
588 '<(PRODUCT_DIR)/libpdf.so', 588 '<(PRODUCT_DIR)/libpdf.so',
589 ], 589 ],
590 }], 590 }],
591 ['libpeer_target_type=="shared_library"', { 591 ['libpeer_target_type=="shared_library"', {
592 'packaging_files_binaries': [ 592 'packaging_files_binaries': [
593 '<(PRODUCT_DIR)/lib.target/libpeerconnection.so', 593 '<(SHARED_LIB_DIR)/libpeerconnection.so',
594 ], 594 ],
595 }], 595 }],
596 ], 596 ],
597 }, 597 },
598 'targets': [ 598 'targets': [
599 { 599 {
600 'target_name': 'linux_installer_configs', 600 'target_name': 'linux_installer_configs',
601 'type': 'none', 601 'type': 'none',
602 # Add these files to the build output so the build archives will be 602 # Add these files to the build output so the build archives will be
603 # "hermetic" for packaging. This is only for branding="Chrome" since 603 # "hermetic" for packaging. This is only for branding="Chrome" since
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1208 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1209 }, 1209 },
1210 }, { # else branding!="Chrome" 1210 }, { # else branding!="Chrome"
1211 'variables': { 1211 'variables': {
1212 'branding_dir': 'app/theme/chromium', 1212 'branding_dir': 'app/theme/chromium',
1213 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1213 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1214 }, 1214 },
1215 }], 1215 }],
1216 ], 1216 ],
1217 } 1217 }
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