]>
Commit | Line | Data |
---|---|---|
3ee15dec ER |
1 | diff -up chromium-20.0.1132.47/build/linux/system.gyp.system-srtp chromium-20.0.1132.47/build/linux/system.gyp |
2 | --- chromium-20.0.1132.47/build/linux/system.gyp.system-srtp 2012-07-07 21:20:26.000000000 -0400 | |
3 | +++ chromium-20.0.1132.47/build/linux/system.gyp 2012-07-07 21:20:56.171006169 -0400 | |
4 | @@ -651,6 +651,27 @@ | |
5 | ], | |
6 | }, | |
7 | { | |
8 | + 'target_name': 'libsrtp', | |
9 | + 'type': 'none', | |
10 | + 'conditions': [ | |
11 | + ['_toolset=="target"', { | |
12 | + 'direct_dependent_settings': { | |
13 | + 'cflags': [ | |
14 | + '<!@(<(pkg-config) --cflags libsrtp)', | |
15 | + ], | |
16 | + }, | |
17 | + 'link_settings': { | |
18 | + 'ldflags': [ | |
19 | + '<!@(<(pkg-config) --libs-only-L --libs-only-other libsrtp)', | |
20 | + ], | |
21 | + 'libraries': [ | |
22 | + '<!@(<(pkg-config) --libs-only-l libsrtp)', | |
23 | + ], | |
24 | + }, | |
25 | + }], | |
26 | + ], | |
27 | + }, | |
28 | + { | |
29 | 'target_name': 'udev', | |
30 | 'type': 'none', | |
31 | 'conditions': [ | |
32 | diff -up chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-srtp chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp | |
33 | --- chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-srtp 2012-06-28 09:01:45.000000000 -0400 | |
34 | +++ chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp 2012-07-07 21:20:26.564006176 -0400 | |
35 | @@ -617,7 +617,7 @@ | |
36 | ['OS!="android"', { | |
37 | 'dependencies': [ | |
38 | # We won't build with WebRTC on Android. | |
39 | - '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', | |
40 | + '../../build/linux/system.gyp:libsrtp', | |
41 | '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module', | |
42 | '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module', | |
43 | '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', |