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

Side by Side Diff: webrtc/media/BUILD.gn

Issue 2316563002: Revert of Remove all reference to carbon api (Closed)
Patch Set: 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
« no previous file with comments | « webrtc/engine_configurations.h ('k') | webrtc/media/devices/carbonvideorenderer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("../build/webrtc.gni") 10 import("../build/webrtc.gni")
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 sources += [ 184 sources += [
185 "devices/gdivideorenderer.cc", 185 "devices/gdivideorenderer.cc",
186 "devices/gdivideorenderer.h", 186 "devices/gdivideorenderer.h",
187 ] 187 ]
188 libs += [ 188 libs += [
189 "d3d9.lib", 189 "d3d9.lib",
190 "gdi32.lib", 190 "gdi32.lib",
191 "strmiids.lib", 191 "strmiids.lib",
192 ] 192 ]
193 } 193 }
194 if (is_mac && current_cpu == "x86") {
195 sources += [
196 "devices/carbonvideorenderer.cc",
197 "devices/carbonvideorenderer.h",
198 ]
199 libs += [ "Carbon.framework" ]
200 }
201 if (is_ios || (is_mac && current_cpu != "x86")) {
202 defines += [ "CARBON_DEPRECATED=YES" ]
203 }
204
194 deps += [ 205 deps += [
195 "..:webrtc_common", 206 "..:webrtc_common",
196 "../base:rtc_base_approved", 207 "../base:rtc_base_approved",
197 "../call", 208 "../call",
198 "../libjingle/xmllite", 209 "../libjingle/xmllite",
199 "../libjingle/xmpp", 210 "../libjingle/xmpp",
200 "../modules/video_coding", 211 "../modules/video_coding",
201 "../p2p", 212 "../p2p",
202 "../system_wrappers", 213 "../system_wrappers",
203 "../video", 214 "../video",
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 deps += [ 388 deps += [
378 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. 389 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
379 ":rtc_media", 390 ":rtc_media",
380 ":rtc_unittest_main", 391 ":rtc_unittest_main",
381 "../audio", 392 "../audio",
382 "../base:rtc_base_tests_utils", 393 "../base:rtc_base_tests_utils",
383 "../system_wrappers:metrics_default", 394 "../system_wrappers:metrics_default",
384 ] 395 ]
385 } 396 }
386 } 397 }
OLDNEW
« no previous file with comments | « webrtc/engine_configurations.h ('k') | webrtc/media/devices/carbonvideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698