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

Side by Side Diff: webrtc/modules/video_capture/video_capture.gypi

Issue 1347083003: Remove the video capture module on Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed Android Java files Created 5 years, 3 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
OLDNEW
1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'targets': [ 10 'targets': [
11 { 11 {
12 # Note this library is missing an implementation for the video capture. 12 # Note this library is missing an implementation for the video capture.
13 # Targets must link with either 'video_capture' or 13 # Targets must link with either 'video_capture' or
14 # 'video_capture_module_internal_impl' depending on whether they want to 14 # 'video_capture_module_internal_impl' depending on whether they want to
15 # use the internal capturer. 15 # use the internal capturer.
16 'target_name': 'video_capture_module', 16 'target_name': 'video_capture_module',
17 'type': 'static_library', 17 'type': 'static_library',
18 'dependencies': [ 18 'dependencies': [
19 'webrtc_utility', 19 'webrtc_utility',
20 '<(webrtc_root)/common.gyp:webrtc_common',
21 '<(webrtc_root)/common_video/common_video.gyp:common_video', 20 '<(webrtc_root)/common_video/common_video.gyp:common_video',
22 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 21 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
23 ], 22 ],
24 'sources': [ 23 'sources': [
25 'device_info_impl.cc', 24 'device_info_impl.cc',
26 'device_info_impl.h', 25 'device_info_impl.h',
27 'include/video_capture.h', 26 'include/video_capture.h',
28 'include/video_capture_defines.h', 27 'include/video_capture_defines.h',
29 'include/video_capture_factory.h', 28 'include/video_capture_factory.h',
30 'video_capture_config.h', 29 'video_capture_config.h',
(...skipping 16 matching lines...) Expand all
47 'external/video_capture_external.cc', 46 'external/video_capture_external.cc',
48 ], 47 ],
49 }, 48 },
50 ], # targets 49 ], # targets
51 'conditions': [ 50 'conditions': [
52 ['build_with_chromium==0', { 51 ['build_with_chromium==0', {
53 'targets': [ 52 'targets': [
54 { 53 {
55 'target_name': 'video_capture_module_internal_impl', 54 'target_name': 'video_capture_module_internal_impl',
56 'type': 'static_library', 55 'type': 'static_library',
57 'dependencies': [
58 'video_capture_module',
59 '<(webrtc_root)/common.gyp:webrtc_common',
60 ],
61 'conditions': [ 56 'conditions': [
57 ['OS!="android"', {
58 'dependencies': [
59 'video_capture_module',
60 '<(webrtc_root)/common.gyp:webrtc_common',
61 ],
62 }],
62 ['OS=="linux"', { 63 ['OS=="linux"', {
63 'sources': [ 64 'sources': [
64 'linux/device_info_linux.cc', 65 'linux/device_info_linux.cc',
65 'linux/device_info_linux.h', 66 'linux/device_info_linux.h',
66 'linux/video_capture_linux.cc', 67 'linux/video_capture_linux.cc',
67 'linux/video_capture_linux.h', 68 'linux/video_capture_linux.h',
68 ], 69 ],
69 }], # linux 70 }], # linux
70 ['OS=="mac"', { 71 ['OS=="mac"', {
71 'sources': [ 72 'sources': [
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 'windows/video_capture_factory_windows.cc', 109 'windows/video_capture_factory_windows.cc',
109 'windows/video_capture_mf.cc', 110 'windows/video_capture_mf.cc',
110 'windows/video_capture_mf.h', 111 'windows/video_capture_mf.h',
111 ], 112 ],
112 'link_settings': { 113 'link_settings': {
113 'libraries': [ 114 'libraries': [
114 '-lStrmiids.lib', 115 '-lStrmiids.lib',
115 ], 116 ],
116 }, 117 },
117 }], # win 118 }], # win
118 ['OS=="android"', {
119 'sources': [
120 'android/device_info_android.cc',
121 'android/device_info_android.h',
122 'android/video_capture_android.cc',
123 'android/video_capture_android.h',
124 ],
125 'conditions': [
126 ['build_json==1', {
127 'dependencies': [
128 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
129 ],
130 }],
131 ['build_icu==1', {
132 'dependencies': [
133 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
134 ],
135 }],
136 ],
137 }], # android
138 ['OS=="ios"', { 119 ['OS=="ios"', {
139 'sources': [ 120 'sources': [
140 'ios/device_info_ios.h', 121 'ios/device_info_ios.h',
141 'ios/device_info_ios.mm', 122 'ios/device_info_ios.mm',
142 'ios/device_info_ios_objc.h', 123 'ios/device_info_ios_objc.h',
143 'ios/device_info_ios_objc.mm', 124 'ios/device_info_ios_objc.mm',
144 'ios/rtc_video_capture_ios_objc.h', 125 'ios/rtc_video_capture_ios_objc.h',
145 'ios/rtc_video_capture_ios_objc.mm', 126 'ios/rtc_video_capture_ios_objc.mm',
146 'ios/video_capture_ios.h', 127 'ios/video_capture_ios.h',
147 'ios/video_capture_ios.mm', 128 'ios/video_capture_ios.mm',
148 ], 129 ],
149 'xcode_settings': { 130 'xcode_settings': {
150 'CLANG_ENABLE_OBJC_ARC': 'YES', 131 'CLANG_ENABLE_OBJC_ARC': 'YES',
151 }, 132 },
152 'all_dependent_settings': { 133 'all_dependent_settings': {
153 'xcode_settings': { 134 'xcode_settings': {
154 'OTHER_LDFLAGS': [ 135 'OTHER_LDFLAGS': [
155 '-framework AVFoundation', 136 '-framework AVFoundation',
156 '-framework CoreMedia', 137 '-framework CoreMedia',
157 '-framework CoreVideo', 138 '-framework CoreVideo',
158 '-framework UIKit', 139 '-framework UIKit',
159 ], 140 ],
160 }, 141 },
161 }, 142 },
162 }], # ios 143 }], # ios
163 ], # conditions 144 ], # conditions
164 }, 145 },
165 ], 146 ],
166 }], # build_with_chromium==0 147 }], # build_with_chromium==0
167 ['include_tests==1', { 148 ['include_tests==1 and OS!="android"', {
168 'targets': [ 149 'targets': [
169 { 150 {
170 'target_name': 'video_capture_tests', 151 'target_name': 'video_capture_tests',
171 'type': '<(gtest_target_type)', 152 'type': '<(gtest_target_type)',
172 'dependencies': [ 153 'dependencies': [
173 'video_capture_module', 154 'video_capture_module',
174 'video_capture_module_internal_impl', 155 'video_capture_module_internal_impl',
175 'webrtc_utility', 156 'webrtc_utility',
176 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 157 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' ,
177 '<(DEPTH)/testing/gtest.gyp:gtest', 158 '<(DEPTH)/testing/gtest.gyp:gtest',
178 ], 159 ],
179 'sources': [ 160 'sources': [
180 'ensure_initialized.cc',
181 'ensure_initialized.h',
182 'test/video_capture_unittest.cc', 161 'test/video_capture_unittest.cc',
183 'test/video_capture_main_mac.mm', 162 'test/video_capture_main_mac.mm',
184 ], 163 ],
185 'conditions': [ 164 'conditions': [
186 ['OS=="mac" or OS=="linux"', { 165 ['OS=="mac" or OS=="linux"', {
187 'cflags': [ 166 'cflags': [
188 '-Wno-write-strings', 167 '-Wno-write-strings',
189 ], 168 ],
190 'ldflags': [ 169 'ldflags': [
191 '-lpthread -lm', 170 '-lpthread -lm',
192 ], 171 ],
193 }], 172 }],
194 ['OS=="linux"', { 173 ['OS=="linux"', {
195 'libraries': [ 174 'libraries': [
196 '-lrt', 175 '-lrt',
197 '-lXext', 176 '-lXext',
198 '-lX11', 177 '-lX11',
199 ], 178 ],
200 }], 179 }],
201 ['OS=="android"', {
202 'dependencies': [
203 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_cod e',
204 ],
205 # Need to disable error due to the line in
206 # base/android/jni_android.h triggering it:
207 # const BASE_EXPORT jobject GetApplicationContext()
208 # error: type qualifiers ignored on function return type
209 'cflags': [
210 '-Wno-ignored-qualifiers',
211 ],
212 }],
213 ['OS=="mac"', { 180 ['OS=="mac"', {
214 'dependencies': [ 181 'dependencies': [
215 # Link with a special main for mac so we can use the webcam. 182 # Link with a special main for mac so we can use the webcam.
216 '<(webrtc_root)/test/test.gyp:test_support_main_threaded_mac', 183 '<(webrtc_root)/test/test.gyp:test_support_main_threaded_mac',
217 ], 184 ],
218 'xcode_settings': { 185 'xcode_settings': {
219 # TODO(andrew): CoreAudio and AudioToolbox shouldn't be needed. 186 # TODO(andrew): CoreAudio and AudioToolbox shouldn't be needed.
220 'OTHER_LDFLAGS': [ 187 'OTHER_LDFLAGS': [
221 '-framework Foundation -framework AppKit -framework Cocoa -fra mework OpenGL -framework CoreVideo -framework CoreAudio -framework AudioToolbox' , 188 '-framework Foundation -framework AppKit -framework Cocoa -fra mework OpenGL -framework CoreVideo -framework CoreAudio -framework AudioToolbox' ,
222 ], 189 ],
223 }, 190 },
224 }], # OS=="mac" 191 }], # OS=="mac"
225 ['OS!="mac"', { 192 ['OS!="mac"', {
226 'dependencies': [ 193 'dependencies': [
227 # Otherwise, use the regular main. 194 # Otherwise, use the regular main.
228 '<(webrtc_root)/test/test.gyp:test_support_main', 195 '<(webrtc_root)/test/test.gyp:test_support_main',
229 ], 196 ],
230 }], # OS!="mac" 197 }], # OS!="mac"
231 ] # conditions 198 ] # conditions
232 }, 199 },
233 ], # targets 200 ], # targets
234 'conditions': [
235 ['OS=="android"', {
236 'targets': [
237 {
238 'target_name': 'video_capture_tests_apk_target',
239 'type': 'none',
240 'dependencies': [
241 '<(apk_tests_path):video_capture_tests_apk',
242 ],
243 },
244 ],
245 }],
246 ['test_isolation_mode != "noop"', {
247 'targets': [
248 {
249 'target_name': 'video_capture_tests_run',
250 'type': 'none',
251 'dependencies': [
252 'video_capture_tests',
253 ],
254 'includes': [
255 '../../build/isolate.gypi',
256 ],
257 'sources': [
258 'video_capture_tests.isolate',
259 ],
260 },
261 ],
262 }],
263 ],
264 }], 201 }],
265 ], 202 ],
266 } 203 }
267 204
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/test/video_capture_unittest.cc ('k') | webrtc/modules/video_capture/video_capture_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698