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

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

Issue 2317343003: Revert of move 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 sources += [ 179 sources += [
180 "devices/gdivideorenderer.cc", 180 "devices/gdivideorenderer.cc",
181 "devices/gdivideorenderer.h", 181 "devices/gdivideorenderer.h",
182 ] 182 ]
183 libs += [ 183 libs += [
184 "d3d9.lib", 184 "d3d9.lib",
185 "gdi32.lib", 185 "gdi32.lib",
186 "strmiids.lib", 186 "strmiids.lib",
187 ] 187 ]
188 } 188 }
189 if (is_mac && current_cpu == "x86") {
190 sources += [
191 "devices/carbonvideorenderer.cc",
192 "devices/carbonvideorenderer.h",
193 ]
194 libs += [ "Carbon.framework" ]
195 }
196 if (is_ios || (is_mac && current_cpu != "x86")) {
197 defines += [ "CARBON_DEPRECATED=YES" ]
198 }
199
189 deps += [ 200 deps += [
190 "..:webrtc_common", 201 "..:webrtc_common",
191 "../api:call_api", 202 "../api:call_api",
192 "../base:rtc_base_approved", 203 "../base:rtc_base_approved",
193 "../call", 204 "../call",
194 "../libjingle/xmllite", 205 "../libjingle/xmllite",
195 "../libjingle/xmpp", 206 "../libjingle/xmpp",
196 "../modules/video_coding", 207 "../modules/video_coding",
197 "../p2p", 208 "../p2p",
198 "../system_wrappers", 209 "../system_wrappers",
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 deps += [ 375 deps += [
365 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. 376 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
366 ":rtc_media", 377 ":rtc_media",
367 ":rtc_unittest_main", 378 ":rtc_unittest_main",
368 "../audio", 379 "../audio",
369 "../base:rtc_base_tests_utils", 380 "../base:rtc_base_tests_utils",
370 "../system_wrappers:metrics_default", 381 "../system_wrappers:metrics_default",
371 ] 382 ]
372 } 383 }
373 } 384 }
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