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

Side by Side Diff: chrome/chrome.gyp

Issue 60070: Fix linking with gold by cleaning up lib dependencies. (Closed)
Patch Set: Created 11 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
« no previous file with comments | « build/linux/system.gyp ('k') | skia/skia.gyp » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 'direct_dependent_settings': { 307 'direct_dependent_settings': {
308 'include_dirs': [ 308 'include_dirs': [
309 '..', 309 '..',
310 ], 310 ],
311 }, 311 },
312 'conditions': [ 312 'conditions': [
313 ['OS=="linux"', { 313 ['OS=="linux"', {
314 'dependencies': [ 314 'dependencies': [
315 '../build/linux/system.gyp:gtk', 315 '../build/linux/system.gyp:gtk',
316 ], 316 ],
317 'link_settings': {
318 'libraries': [
319 '-lX11',
320 '-lXrender',
321 '-lXext',
322 ],
323 },
317 }, { # else: 'OS!="linux"' 324 }, { # else: 'OS!="linux"'
318 'sources!': [ 325 'sources!': [
319 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', 326 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
320 ], 327 ],
321 }], 328 }],
322 ['OS=="win"', { 329 ['OS=="win"', {
323 'include_dirs': [ 330 'include_dirs': [
324 'third_party/wtl/include', 331 'third_party/wtl/include',
325 ], 332 ],
326 'sources!': [ 333 'sources!': [
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1530 'xcode_settings': { 1537 'xcode_settings': {
1531 'INFOPLIST_FILE': 'app/app-Info.plist', 1538 'INFOPLIST_FILE': 'app/app-Info.plist',
1532 }, 1539 },
1533 'conditions': [ 1540 'conditions': [
1534 ['OS=="linux"', { 1541 ['OS=="linux"', {
1535 'dependencies': [ 1542 'dependencies': [
1536 'views', 1543 'views',
1537 # Needed for chrome_dll_main.cc #include of gtk/gtk.h 1544 # Needed for chrome_dll_main.cc #include of gtk/gtk.h
1538 '../build/linux/system.gyp:gtk', 1545 '../build/linux/system.gyp:gtk',
1539 ], 1546 ],
1540 'link_settings': {
1541 'libraries': [
1542 '-lX11',
1543 '-lXrender',
1544 '-lXext',
1545 ],
1546 },
1547 'copies': [ 1547 'copies': [
1548 { 1548 {
1549 'destination': '<(PRODUCT_DIR)', 1549 'destination': '<(PRODUCT_DIR)',
1550 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak'], 1550 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak'],
1551 }, 1551 },
1552 { 1552 {
1553 'destination': '<(PRODUCT_DIR)/locales', 1553 'destination': '<(PRODUCT_DIR)/locales',
1554 'files': ['<(INTERMEDIATE_DIR)/repack/en-US.pak'], 1554 'files': ['<(INTERMEDIATE_DIR)/repack/en-US.pak'],
1555 }, 1555 },
1556 { 1556 {
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
2800 'Debug': { 2800 'Debug': {
2801 'msvs_precompiled_header': 'tools/build/win/precompiled.h', 2801 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
2802 'msvs_precompiled_source': 'tools/build/win/precompiled.cc', 2802 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
2803 }, 2803 },
2804 }, 2804 },
2805 }, 2805 },
2806 ]}, # 'targets' 2806 ]}, # 'targets'
2807 ], # OS=="win" 2807 ], # OS=="win"
2808 ], # 'conditions' 2808 ], # 'conditions'
2809 } 2809 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698