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

Side by Side Diff: third_party/libjingle/libjingle.gyp

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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 | « testing/android/native_test.gyp ('k') | third_party/sqlite/sqlite.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) 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 'includes': [ 6 'includes': [
7 '../../build/win_precompile.gypi', 7 '../../build/win_precompile.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'enabled_libjingle_device_manager%': 0, 10 'enabled_libjingle_device_manager%': 0,
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 '<(libjingle_source)/talk/base/unixfilesystem.h', 538 '<(libjingle_source)/talk/base/unixfilesystem.h',
539 ], 539 ],
540 }], 540 }],
541 ['OS=="linux"', { 541 ['OS=="linux"', {
542 'sources': [ 542 'sources': [
543 '<(libjingle_source)/talk/base/latebindingsymboltable.cc', 543 '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
544 '<(libjingle_source)/talk/base/latebindingsymboltable.h', 544 '<(libjingle_source)/talk/base/latebindingsymboltable.h',
545 '<(libjingle_source)/talk/base/linux.cc', 545 '<(libjingle_source)/talk/base/linux.cc',
546 '<(libjingle_source)/talk/base/linux.h', 546 '<(libjingle_source)/talk/base/linux.h',
547 ], 547 ],
548 'link_settings': {
549 'libraries': [
550 '-lrt',
551 ],
552 },
553 }],
554 ['OS=="mac"', {
555 'link_settings': {
556 'libraries': [
557 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
558 '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
559 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
560 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framewor k',
561 ],
562 },
548 }], 563 }],
549 ['OS=="mac" or OS=="ios"', { 564 ['OS=="mac" or OS=="ios"', {
550 'sources': [ 565 'sources': [
551 '<(libjingle_source)/talk/base/macconversion.cc', 566 '<(libjingle_source)/talk/base/macconversion.cc',
552 '<(libjingle_source)/talk/base/macconversion.h', 567 '<(libjingle_source)/talk/base/macconversion.h',
553 '<(libjingle_source)/talk/base/maccocoathreadhelper.h', 568 '<(libjingle_source)/talk/base/maccocoathreadhelper.h',
554 '<(libjingle_source)/talk/base/maccocoathreadhelper.mm', 569 '<(libjingle_source)/talk/base/maccocoathreadhelper.mm',
555 '<(libjingle_source)/talk/base/macutils.cc', 570 '<(libjingle_source)/talk/base/macutils.cc',
556 '<(libjingle_source)/talk/base/macutils.h', 571 '<(libjingle_source)/talk/base/macutils.h',
557 '<(libjingle_source)/talk/base/scoped_autorelease_pool.h', 572 '<(libjingle_source)/talk/base/scoped_autorelease_pool.h',
558 '<(libjingle_source)/talk/base/scoped_autorelease_pool.mm', 573 '<(libjingle_source)/talk/base/scoped_autorelease_pool.mm',
559 ], 574 ],
575 'link_settings': {
576 'libraries': [
577 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
578 ],
579 },
560 }], 580 }],
561 ['OS=="android"', { 581 ['OS=="android"', {
562 'sources': [ 582 'sources': [
563 '<(libjingle_source)/talk/base/ifaddrs-android.cc', 583 '<(libjingle_source)/talk/base/ifaddrs-android.cc',
564 '<(libjingle_source)/talk/base/ifaddrs-android.h', 584 '<(libjingle_source)/talk/base/ifaddrs-android.h',
565 '<(libjingle_source)/talk/base/linux.cc', 585 '<(libjingle_source)/talk/base/linux.cc',
566 '<(libjingle_source)/talk/base/linux.h', 586 '<(libjingle_source)/talk/base/linux.h',
567 ], 587 ],
568 'sources!': [ 588 'sources!': [
569 # These depend on jsoncpp which we don't load because we probably 589 # These depend on jsoncpp which we don't load because we probably
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 # in this directory and not lib.target as will otherwise be 972 # in this directory and not lib.target as will otherwise be
953 # the case with make builds. 973 # the case with make builds.
954 'product_dir': '<(PRODUCT_DIR)/lib', 974 'product_dir': '<(PRODUCT_DIR)/lib',
955 }], 975 }],
956 ], 976 ],
957 }, # target libpeerconnection 977 }, # target libpeerconnection
958 ], 978 ],
959 }], 979 }],
960 ], 980 ],
961 } 981 }
OLDNEW
« no previous file with comments | « testing/android/native_test.gyp ('k') | third_party/sqlite/sqlite.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698