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

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

Issue 1357913002: Update to use third_party/webrtc_overrides instead of third_party/webrtc/overrides. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add_webrtc_overrides
Patch Set: Rebase. Created 5 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 | « third_party/libjingle/BUILD.gn ('k') | 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 28 matching lines...) Expand all
39 'Debug': { 39 'Debug': {
40 'defines': [ 40 'defines': [
41 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 41 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
42 # _DEBUG and remove this define. See below as well. 42 # _DEBUG and remove this define. See below as well.
43 '_DEBUG', 43 '_DEBUG',
44 ], 44 ],
45 } 45 }
46 }, 46 },
47 'include_dirs': [ 47 'include_dirs': [
48 './overrides', 48 './overrides',
49 '../../third_party/webrtc/overrides', 49 '../../third_party/webrtc_overrides',
50 './<(libjingle_source)', 50 './<(libjingle_source)',
51 '../..', 51 '../..',
52 '../../testing/gtest/include', 52 '../../testing/gtest/include',
53 '../../third_party', 53 '../../third_party',
54 '../../third_party/libyuv/include', 54 '../../third_party/libyuv/include',
55 '../../third_party/usrsctp', 55 '../../third_party/usrsctp',
56 ], 56 ],
57 # These dependencies have been translated into :jingle_deps in the GN build. 57 # These dependencies have been translated into :jingle_deps in the GN build.
58 'dependencies': [ 58 'dependencies': [
59 '<(DEPTH)/base/base.gyp:base', 59 '<(DEPTH)/base/base.gyp:base',
60 '<(DEPTH)/net/net.gyp:net', 60 '<(DEPTH)/net/net.gyp:net',
61 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl', 61 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
62 '<(DEPTH)/third_party/expat/expat.gyp:expat', 62 '<(DEPTH)/third_party/expat/expat.gyp:expat',
63 ], 63 ],
64 'export_dependent_settings': [ 64 'export_dependent_settings': [
65 '<(DEPTH)/third_party/expat/expat.gyp:expat', 65 '<(DEPTH)/third_party/expat/expat.gyp:expat',
66 ], 66 ],
67 'direct_dependent_settings': { 67 'direct_dependent_settings': {
68 'include_dirs': [ 68 'include_dirs': [
69 '../../third_party/webrtc/overrides', 69 '../../third_party/webrtc_overrides',
70 './overrides', 70 './overrides',
71 './<(libjingle_source)', 71 './<(libjingle_source)',
72 '../..', 72 '../..',
73 '../../testing/gtest/include', 73 '../../testing/gtest/include',
74 '../../third_party', 74 '../../third_party',
75 ], 75 ],
76 'defines': [ 76 'defines': [
77 'FEATURE_ENABLE_SSL', 77 'FEATURE_ENABLE_SSL',
78 'FEATURE_ENABLE_VOICEMAIL', 78 'FEATURE_ENABLE_VOICEMAIL',
79 'EXPAT_RELATIVE_PATH', 79 'EXPAT_RELATIVE_PATH',
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 'conditions': [ 519 'conditions': [
520 ['OS=="android"', { 520 ['OS=="android"', {
521 'standalone_static_library': 1, 521 'standalone_static_library': 1,
522 }], 522 }],
523 ], 523 ],
524 }, # target libpeerconnection 524 }, # target libpeerconnection
525 ], 525 ],
526 }], 526 }],
527 ], 527 ],
528 } 528 }
OLDNEW
« no previous file with comments | « third_party/libjingle/BUILD.gn ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698