1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
diff --git a/media/webrtc/trunk/gtest/moz.build b/media/webrtc/trunk/gtest/moz.build
--- a/media/webrtc/trunk/gtest/moz.build
+++ b/media/webrtc/trunk/gtest/moz.build
@@ -25,30 +25,38 @@ LOCAL_INCLUDES += [
'/media/libopus/include',
'/media/libopus/src',
]
USE_LIBS += [
'/media/webrtc/trunk/third_party/gflags/gflags_gflags/gflags',
'/testing/gtest/gtest',
- 'media_libjpeg',
'media_libopus',
- 'media_libvpx',
'mozglue',
'speex',
'webrtc',
'webrtc_common',
'webrtc_i420',
'webrtc_lib',
'webrtc_utility',
'webrtc_vp8',
'webrtc_vp9',
'yuv',
]
+if CONFIG['MOZ_SYSTEM_JPEG']:
+ OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
+else:
+ USE_LIBS += ['media_libjpeg']
+
+if CONFIG['MOZ_SYSTEM_LIBVPX']:
+ OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
+else:
+ USE_LIBS += ['media_libvpx']
+
if CONFIG['OS_TARGET'] in ['Darwin', 'Linux', 'WINNT']:
if CONFIG['OS_TARGET'] == 'Linux':
DEFINES['WEBRTC_LINUX'] = True
DEFINES['WEBRTC_POSIX'] = True
LOCAL_INCLUDES += [
'../third_party/gflags/gen/posix/include',
|
