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

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

Issue 279423006: Include path to chromium's trunk should be before webrtc when building libjingle (otherwise e.g. we… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder and removed unnecessary forward slash 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 | 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 '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 '../..',
44 '../../testing/gtest/include', 45 '../../testing/gtest/include',
45 '../../third_party', 46 '../../third_party',
46 '../../third_party/libyuv/include', 47 '../../third_party/libyuv/include',
47 '../../third_party/usrsctp', 48 '../../third_party/usrsctp',
48 '../../third_party/webrtc', 49 '../../third_party/webrtc',
49 ], 50 ],
50 'dependencies': [ 51 'dependencies': [
51 '<(DEPTH)/base/base.gyp:base', 52 '<(DEPTH)/base/base.gyp:base',
52 '<(DEPTH)/net/net.gyp:net', 53 '<(DEPTH)/net/net.gyp:net',
53 '<(DEPTH)/third_party/expat/expat.gyp:expat', 54 '<(DEPTH)/third_party/expat/expat.gyp:expat',
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 # in this directory and not lib.target as will otherwise be 640 # in this directory and not lib.target as will otherwise be
640 # the case with make builds. 641 # the case with make builds.
641 'product_dir': '<(PRODUCT_DIR)/lib', 642 'product_dir': '<(PRODUCT_DIR)/lib',
642 }], 643 }],
643 ], 644 ],
644 }, # target libpeerconnection 645 }, # target libpeerconnection
645 ], 646 ],
646 }], 647 }],
647 ], 648 ],
648 } 649 }
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