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

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

Issue 1457053003: Remove build_with_libjingle and exclude failing iOS tests from 'All' target. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed modules_unittests for iOS simulator builds Created 5 years, 1 month 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) 2011 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2011 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 'windows/video_render_windows_impl.cc', 146 'windows/video_render_windows_impl.cc',
147 ], 147 ],
148 'include_dirs': [ 148 'include_dirs': [
149 '<(directx_sdk_path)/Include', 149 '<(directx_sdk_path)/Include',
150 ], 150 ],
151 }], 151 }],
152 ] # conditions 152 ] # conditions
153 }, 153 },
154 ], 154 ],
155 }], # build_with_chromium==0 155 }], # build_with_chromium==0
156 ['include_tests==1', { 156 ['include_tests==1 and OS!="ios"', {
157 'targets': [ 157 'targets': [
158 { 158 {
159 # Does not compile on iOS: webrtc:4755.
159 'target_name': 'video_render_tests', 160 'target_name': 'video_render_tests',
160 'type': 'executable', 161 'type': 'executable',
161 'dependencies': [ 162 'dependencies': [
162 'video_render_module_internal_impl', 163 'video_render_module_internal_impl',
163 'webrtc_utility', 164 'webrtc_utility',
164 '<(webrtc_root)/common.gyp:webrtc_common', 165 '<(webrtc_root)/common.gyp:webrtc_common',
165 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 166 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' ,
166 '<(webrtc_root)/common_video/common_video.gyp:common_video', 167 '<(webrtc_root)/common_video/common_video.gyp:common_video',
167 ], 168 ],
168 'sources': [ 169 'sources': [
(...skipping 21 matching lines...) Expand all
190 ['OS=="mac"', { 191 ['OS=="mac"', {
191 'xcode_settings': { 192 'xcode_settings': {
192 'OTHER_LDFLAGS': [ 193 'OTHER_LDFLAGS': [
193 '-framework Foundation -framework AppKit -framework Cocoa -fra mework OpenGL', 194 '-framework Foundation -framework AppKit -framework Cocoa -fra mework OpenGL',
194 ], 195 ],
195 }, 196 },
196 }], 197 }],
197 ] # conditions 198 ] # conditions
198 }, # video_render_module_test 199 }, # video_render_module_test
199 ], # targets 200 ], # targets
200 }], # include_tests==1 201 }], # include_tests==1 and OS!=ios
201 ], # conditions 202 ], # conditions
202 } 203 }
203 204
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698