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

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

Issue 293983009: Fixes dependency ordering to get libjingle style overrides working for webrtc. See http://chromegw.… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | third_party/libjingle/libjingle_nacl.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 23 matching lines...) Expand all
34 'defines': [ 34 'defines': [
35 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 35 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
36 # _DEBUG and remove this define. See below as well. 36 # _DEBUG and remove this define. See below as well.
37 '_DEBUG', 37 '_DEBUG',
38 ], 38 ],
39 } 39 }
40 }, 40 },
41 'include_dirs': [ 41 'include_dirs': [
42 './overrides', 42 './overrides',
43 './<(libjingle_source)', 43 './<(libjingle_source)',
44 '../../third_party/webrtc/overrides',
44 '../..', 45 '../..',
45 '../../testing/gtest/include', 46 '../../testing/gtest/include',
46 '../../third_party', 47 '../../third_party',
47 '../../third_party/libyuv/include', 48 '../../third_party/libyuv/include',
48 '../../third_party/usrsctp', 49 '../../third_party/usrsctp',
49 '../../third_party/webrtc', 50 '../../third_party/webrtc',
50 ], 51 ],
51 'dependencies': [ 52 'dependencies': [
52 '<(DEPTH)/base/base.gyp:base', 53 '<(DEPTH)/base/base.gyp:base',
53 '<(DEPTH)/net/net.gyp:net', 54 '<(DEPTH)/net/net.gyp:net',
54 '<(DEPTH)/third_party/expat/expat.gyp:expat', 55 '<(DEPTH)/third_party/expat/expat.gyp:expat',
55 ], 56 ],
56 'export_dependent_settings': [ 57 'export_dependent_settings': [
57 '<(DEPTH)/third_party/expat/expat.gyp:expat', 58 '<(DEPTH)/third_party/expat/expat.gyp:expat',
58 ], 59 ],
59 'direct_dependent_settings': { 60 'direct_dependent_settings': {
60 'include_dirs': [ 61 'include_dirs': [
61 './overrides', 62 './overrides',
62 './<(libjingle_source)', 63 './<(libjingle_source)',
64 '../../third_party/webrtc/overrides',
63 '../..', 65 '../..',
64 '../../testing/gtest/include', 66 '../../testing/gtest/include',
65 '../../third_party', 67 '../../third_party',
66 '../../third_party/webrtc', 68 '../../third_party/webrtc',
67 ], 69 ],
68 'defines': [ 70 'defines': [
69 'FEATURE_ENABLE_SSL', 71 'FEATURE_ENABLE_SSL',
70 'FEATURE_ENABLE_VOICEMAIL', 72 'FEATURE_ENABLE_VOICEMAIL',
71 'EXPAT_RELATIVE_PATH', 73 'EXPAT_RELATIVE_PATH',
72 'GTEST_RELATIVE_PATH', 74 'GTEST_RELATIVE_PATH',
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 # in this directory and not lib.target as will otherwise be 644 # in this directory and not lib.target as will otherwise be
643 # the case with make builds. 645 # the case with make builds.
644 'product_dir': '<(PRODUCT_DIR)/lib', 646 'product_dir': '<(PRODUCT_DIR)/lib',
645 }], 647 }],
646 ], 648 ],
647 }, # target libpeerconnection 649 }, # target libpeerconnection
648 ], 650 ],
649 }], 651 }],
650 ], 652 ],
651 } 653 }
OLDNEW
« no previous file with comments | « no previous file | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698