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

Side by Side Diff: webrtc/media/media.gyp

Issue 2299633002: Remove all reference to carbon api (Closed)
Patch Set: Fix chromium build errors Created 4 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) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 'msvs_settings': { 166 'msvs_settings': {
167 'VCLibrarianTool': { 167 'VCLibrarianTool': {
168 'AdditionalDependencies': [ 168 'AdditionalDependencies': [
169 'd3d9.lib', 169 'd3d9.lib',
170 'gdi32.lib', 170 'gdi32.lib',
171 'strmiids.lib', 171 'strmiids.lib',
172 ], 172 ],
173 }, 173 },
174 }, 174 },
175 }], 175 }],
176 ['OS=="mac" and target_arch=="ia32"', {
177 'sources': [
178 'devices/carbonvideorenderer.cc',
179 'devices/carbonvideorenderer.h',
180 ],
181 'link_settings': {
182 'xcode_settings': {
183 'OTHER_LDFLAGS': [
184 '-framework Carbon',
185 ],
186 },
187 },
188 }],
189 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
190 'defines': [
191 'CARBON_DEPRECATED=YES',
192 ],
193 }],
194 ], 176 ],
195 }, # target rtc_media 177 }, # target rtc_media
196 ], # targets. 178 ], # targets.
197 'conditions': [ 179 'conditions': [
198 ['include_tests==1', { 180 ['include_tests==1', {
199 'targets' : [ 181 'targets' : [
200 { 182 {
201 'target_name': 'rtc_unittest_main', 183 'target_name': 'rtc_unittest_main',
202 'type': 'static_library', 184 'type': 'static_library',
203 'dependencies': [ 185 'dependencies': [
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 'sources': [ 349 'sources': [
368 'rtc_media_unittests.isolate', 350 'rtc_media_unittests.isolate',
369 ], 351 ],
370 }, 352 },
371 ], 353 ],
372 }], 354 }],
373 ], # conditions 355 ], # conditions
374 }], # include_tests==1 356 }], # include_tests==1
375 ], # conditions 357 ], # conditions
376 } 358 }
OLDNEW
« no previous file with comments | « webrtc/media/devices/videorendererfactory.h ('k') | webrtc/modules/desktop_capture/mac/desktop_configuration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698