| Index: webrtc/media/media.gyp
|
| diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
|
| index e4960e16c9b48f5a8a2b4cbcd212cba60baf00c2..d17ed0274d766946b7dd93265de809b39d983cbb 100644
|
| --- a/webrtc/media/media.gyp
|
| +++ b/webrtc/media/media.gyp
|
| @@ -76,10 +76,6 @@
|
| 'base/videorenderer.h',
|
| 'base/yuvframegenerator.cc',
|
| 'base/yuvframegenerator.h',
|
| - 'devices/deviceinfo.h',
|
| - 'devices/devicemanager.cc',
|
| - 'devices/devicemanager.h',
|
| - 'devices/dummydevicemanager.h',
|
| 'devices/videorendererfactory.h',
|
| 'engine/nullwebrtcvideoengine.h',
|
| 'engine/simulcast.cc',
|
| @@ -162,9 +158,6 @@
|
| 'sources': [
|
| 'devices/libudevsymboltable.cc',
|
| 'devices/libudevsymboltable.h',
|
| - 'devices/linuxdeviceinfo.cc',
|
| - 'devices/linuxdevicemanager.cc',
|
| - 'devices/linuxdevicemanager.h',
|
| 'devices/v4llookup.cc',
|
| 'devices/v4llookup.h',
|
| ],
|
| @@ -190,9 +183,6 @@
|
| 'sources': [
|
| 'devices/gdivideorenderer.cc',
|
| 'devices/gdivideorenderer.h',
|
| - 'devices/win32deviceinfo.cc',
|
| - 'devices/win32devicemanager.cc',
|
| - 'devices/win32devicemanager.h',
|
| ],
|
| 'msvs_settings': {
|
| 'VCLibrarianTool': {
|
| @@ -206,12 +196,6 @@
|
| },
|
| }],
|
| ['OS=="mac"', {
|
| - 'sources': [
|
| - 'devices/macdeviceinfo.cc',
|
| - 'devices/macdevicemanager.cc',
|
| - 'devices/macdevicemanager.h',
|
| - 'devices/macdevicemanagermm.mm',
|
| - ],
|
| 'conditions': [
|
| ['target_arch=="ia32"', {
|
| 'sources': [
|
| @@ -227,17 +211,6 @@
|
| },
|
| }],
|
| ],
|
| - 'xcode_settings': {
|
| - 'WARNING_CFLAGS': [
|
| - # TODO(ronghuawu): Update macdevicemanager.cc to stop using
|
| - # deprecated functions and remove this flag.
|
| - '-Wno-deprecated-declarations',
|
| - ],
|
| - # Disable partial availability warning to prevent errors
|
| - # in macdevicemanagermm.mm using AVFoundation.
|
| - # https://code.google.com/p/webrtc/issues/detail?id=4695
|
| - 'WARNING_CFLAGS!': ['-Wpartial-availability'],
|
| - },
|
| 'link_settings': {
|
| 'xcode_settings': {
|
| 'OTHER_LDFLAGS': [
|
| @@ -251,36 +224,11 @@
|
| },
|
| },
|
| }],
|
| - ['OS=="ios"', {
|
| - 'sources': [
|
| - 'devices/mobiledevicemanager.cc',
|
| - ],
|
| - 'include_dirs': [
|
| - # TODO(sjlee) Remove when vp8 is building for iOS. vp8 pulls in
|
| - # libjpeg which pulls in libyuv which currently disabled.
|
| - '../../third_party/libyuv/include',
|
| - ],
|
| - # TODO(kjellander): Make the code compile without disabling these.
|
| - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
|
| - 'cflags': [
|
| - '-Wno-unused-const-variable',
|
| - ],
|
| - 'xcode_settings': {
|
| - 'WARNING_CFLAGS': [
|
| - '-Wno-unused-const-variable',
|
| - ],
|
| - },
|
| - }],
|
| ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
|
| 'defines': [
|
| 'CARBON_DEPRECATED=YES',
|
| ],
|
| }],
|
| - ['OS=="android"', {
|
| - 'sources': [
|
| - 'devices/mobiledevicemanager.cc',
|
| - ],
|
| - }],
|
| ],
|
| }, # target rtc_media
|
| ], # targets.
|
|
|