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

Side by Side Diff: talk/build/common.gypi

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 | « talk/app/webrtc/webrtcsessiondescriptionfactory.h ('k') | talk/libjingle.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 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 12 matching lines...) Expand all
23 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 # 26 #
27 27
28 # This file contains common settings for building libjingle components. 28 # This file contains common settings for building libjingle components.
29 29
30 { 30 {
31 'variables': { 31 'variables': {
32 'webrtc_root%': '<(DEPTH)/webrtc', 32 'webrtc_root%': '<(DEPTH)/webrtc',
33 'libjingle_tests_additional_deps%': [],
34 # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a 33 # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a
35 # flood of chromium-style warnings. 34 # flood of chromium-style warnings.
36 'clang_use_chrome_plugins%': 0, 35 'clang_use_chrome_plugins%': 0,
37 'conditions': [ 36 'conditions': [
38 ['OS=="android" or OS=="linux"', { 37 ['OS=="android" or OS=="linux"', {
39 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/ usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'i nclude/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a direct ory containing include/jni.h!\'; print dir")', 38 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/ usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'i nclude/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a direct ory containing include/jni.h!\'; print dir")',
40 }], 39 }],
41 ], 40 ],
42 # Disable these to not build components which can be externally provided. 41 # Disable these to not build components which can be externally provided.
43 'build_expat%': 1, 42 'build_expat%': 1,
44 'build_json%': 1, 43 'build_json%': 1,
45 'build_libsrtp%': 1, 44 'build_libsrtp%': 1,
46 'build_libyuv%': 1,
47 'build_usrsctp%': 1,
48 # Make it possible to provide custom locations for some libraries. 45 # Make it possible to provide custom locations for some libraries.
49 'libyuv_dir%': '<(DEPTH)/third_party/libyuv', 46 'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
50 47
51 # Disable this to skip building source requiring GTK. 48 # Disable this to skip building source requiring GTK.
52 'use_gtk%': 1, 49 'use_gtk%': 1,
53 }, 50 },
54 'target_defaults': { 51 'target_defaults': {
55 'include_dirs': [ 52 'include_dirs': [
56 '<(DEPTH)', 53 '<(DEPTH)',
57 '../..', 54 '../..',
58 '../../third_party', 55 '../../third_party',
59 '../../third_party/webrtc', 56 '../../third_party/webrtc',
60 '../../webrtc', 57 '../../webrtc',
61 ], 58 ],
62 'defines': [ 59 'defines': [
63 'SRTP_RELATIVE_PATH', 60 'SRTP_RELATIVE_PATH',
64 61
65 # Feature selection 62 # Feature selection
66 'HAVE_SCTP', 63 'HAVE_SCTP',
67 'HAVE_SRTP', 64 'HAVE_SRTP',
68 'HAVE_WEBRTC_VIDEO',
69 'HAVE_WEBRTC_VOICE',
70 ], 65 ],
71 'conditions': [ 66 'conditions': [
72 ['OS=="linux"', { 67 ['OS=="linux"', {
73 'defines': [ 68 'defines': [
74 'WEBRTC_LINUX', 69 'WEBRTC_LINUX',
75 ], 70 ],
76 # Remove Chromium's disabling of the -Wformat warning. 71 # Remove Chromium's disabling of the -Wformat warning.
77 'cflags!': [ 72 'cflags!': [
78 '-Wno-format', 73 '-Wno-format',
79 ], 74 ],
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 'HASH_NAMESPACE=__gnu_cxx', 137 'HASH_NAMESPACE=__gnu_cxx',
143 'WEBRTC_POSIX', 138 'WEBRTC_POSIX',
144 'DISABLE_DYNAMIC_CAST', 139 'DISABLE_DYNAMIC_CAST',
145 # The POSIX standard says we have to define this. 140 # The POSIX standard says we have to define this.
146 '_REENTRANT', 141 '_REENTRANT',
147 ], 142 ],
148 }], 143 }],
149 ], 144 ],
150 }, # target_defaults 145 }, # target_defaults
151 } 146 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsessiondescriptionfactory.h ('k') | talk/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698