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

Side by Side Diff: build/common.gypi

Issue 10389047: mac: Don't require DYLD_LIBRARY_PATH to be set when using the shared build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 years, 6 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 | chrome/chrome.gyp » ('j') | content/common/sandbox_mac.mm » ('J')
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 }, 1266 },
1267 'conditions': [ 1267 'conditions': [
1268 ['OS=="win" and "<(msbuild_toolset)"!=""', { 1268 ['OS=="win" and "<(msbuild_toolset)"!=""', {
1269 'msbuild_toolset': '<(msbuild_toolset)', 1269 'msbuild_toolset': '<(msbuild_toolset)',
1270 }], 1270 }],
1271 ['branding=="Chrome"', { 1271 ['branding=="Chrome"', {
1272 'defines': ['GOOGLE_CHROME_BUILD'], 1272 'defines': ['GOOGLE_CHROME_BUILD'],
1273 }, { # else: branding!="Chrome" 1273 }, { # else: branding!="Chrome"
1274 'defines': ['CHROMIUM_BUILD'], 1274 'defines': ['CHROMIUM_BUILD'],
1275 }], 1275 }],
1276 ['OS=="mac" and component=="shared_library"', {
1277 'xcode_settings': {
1278 'DYLIB_INSTALL_NAME_BASE': '@rpath',
1279 'LD_RUNPATH_SEARCH_PATHS': [
1280 # For unbundled binaries.
1281 '@loader_path/.',
1282 # For bundled binaries, to get back from Binary.app/Contents/MacOS.
1283 '@loader_path/../../..',
1284 ],
1285 },
1286 }],
1276 ['branding=="Chrome" and (OS=="win" or OS=="mac")', { 1287 ['branding=="Chrome" and (OS=="win" or OS=="mac")', {
1277 'defines': ['ENABLE_RLZ'], 1288 'defines': ['ENABLE_RLZ'],
1278 }], 1289 }],
1279 ['component=="shared_library"', { 1290 ['component=="shared_library"', {
1280 'defines': ['COMPONENT_BUILD'], 1291 'defines': ['COMPONENT_BUILD'],
1281 }], 1292 }],
1282 ['toolkit_views==1', { 1293 ['toolkit_views==1', {
1283 'defines': ['TOOLKIT_VIEWS=1'], 1294 'defines': ['TOOLKIT_VIEWS=1'],
1284 }], 1295 }],
1285 ['ui_compositor_image_transport==1', { 1296 ['ui_compositor_image_transport==1', {
(...skipping 1830 matching lines...) Expand 10 before | Expand all | Expand 10 after
3116 # settings in target dicts. SYMROOT is a special case, because many other 3127 # settings in target dicts. SYMROOT is a special case, because many other
3117 # Xcode variables depend on it, including variables such as 3128 # Xcode variables depend on it, including variables such as
3118 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3129 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3119 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3130 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3120 # files to appear (when present) in the UI as actual files and not red 3131 # files to appear (when present) in the UI as actual files and not red
3121 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3132 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3122 # and therefore SYMROOT, needs to be set at the project level. 3133 # and therefore SYMROOT, needs to be set at the project level.
3123 'SYMROOT': '<(DEPTH)/xcodebuild', 3134 'SYMROOT': '<(DEPTH)/xcodebuild',
3124 }, 3135 },
3125 } 3136 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | content/common/sandbox_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698