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

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

Issue 1983583002: Revert of Delete webrtc::VideoFrame methods buffer and stride. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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': [
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 ['include_tests==1 and OS!="android"', { 165 ['include_tests==1 and OS!="android"', {
166 'targets': [ 166 'targets': [
167 { 167 {
168 'target_name': 'video_capture_tests', 168 'target_name': 'video_capture_tests',
169 'type': '<(gtest_target_type)', 169 'type': '<(gtest_target_type)',
170 'dependencies': [ 170 'dependencies': [
171 'video_capture_module', 171 'video_capture_module',
172 'video_capture_module_internal_impl', 172 'video_capture_module_internal_impl',
173 'webrtc_utility', 173 'webrtc_utility',
174 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 174 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' ,
175 '<(webrtc_root)/test/test.gyp:video_test_common',
176 '<(DEPTH)/testing/gtest.gyp:gtest', 175 '<(DEPTH)/testing/gtest.gyp:gtest',
177 ], 176 ],
178 'sources': [ 177 'sources': [
179 'test/video_capture_unittest.cc', 178 'test/video_capture_unittest.cc',
180 'test/video_capture_main_mac.mm', 179 'test/video_capture_main_mac.mm',
181 ], 180 ],
182 'conditions': [ 181 'conditions': [
183 ['OS=="mac" or OS=="linux"', { 182 ['OS=="mac" or OS=="linux"', {
184 'cflags': [ 183 'cflags': [
185 '-Wno-write-strings', 184 '-Wno-write-strings',
(...skipping 27 matching lines...) Expand all
213 '<(webrtc_root)/test/test.gyp:test_support_main', 212 '<(webrtc_root)/test/test.gyp:test_support_main',
214 ], 213 ],
215 }], # OS!="mac" 214 }], # OS!="mac"
216 ] # conditions 215 ] # conditions
217 }, 216 },
218 ], # targets 217 ], # targets
219 }], 218 }],
220 ], 219 ],
221 } 220 }
222 221
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698