Make it possible to exclude device management code from rtc_media target.

webrtc/media/media.gyp

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'includes': [ '../build/common.gypi', ],
@@ skipping 59 matching lines @@
         'base/videocommon.cc',
         'base/videocommon.h',
         'base/videoframe.cc',
         'base/videoframe.h',
         'base/videoframefactory.cc',
         'base/videoframefactory.h',
         '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',

[kjellander_webrtc, 2016/02/15 16:45:45]

Should we split out simulcast.cc and friends into a 'libpeerconnection' static
library so it becomes similar to
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjin...
?

[kjellander_webrtc, 2016/02/29 09:18:59]

I'll do this, but in a separate CL.

         'engine/simulcast.h',
         'engine/webrtccommon.h',
         'engine/webrtcmediaengine.cc',
         'engine/webrtcmediaengine.h',
         'engine/webrtcmediaengine.cc',
         'engine/webrtcvideocapturer.cc',
         'engine/webrtcvideocapturer.h',
         'engine/webrtcvideocapturerfactory.h',
         'engine/webrtcvideocapturerfactory.cc',
         'engine/webrtcvideodecoderfactory.h',
@@ skipping 21 matching lines @@
       'cflags_cc!': [
         '-Wnon-virtual-dtor',
         '-Woverloaded-virtual',
       ],
       'msvs_disabled_warnings': [
         4245,  # conversion from 'int' to 'size_t', signed/unsigned mismatch.
         4267,  # conversion from 'size_t' to 'int', possible loss of data.
         4389,  # signed/unsigned mismatch.
       ],
       'conditions': [
+        ['include_internal_device_management==1', {
+          'sources': [
+            'devices/devicemanager.cc',
+            'devices/devicemanager.h',
+          ],
+        }, {
+          'sources': [
+            'devices/dummydevicemanager.cc',
+            'devices/dummydevicemanager.h',
+          ],
+        }],
         ['build_libyuv==1', {
           'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
         }],
         ['build_usrsctp==1', {
           'include_dirs': [
             # TODO(jiayl): move this into the direct_dependent_settings of
             # usrsctp.gyp.
             '<(DEPTH)/third_party/usrsctp/usrsctplib',
           ],
           'dependencies': [
@@ skipping 15 matching lines @@
               'HAVE_WEBRTC_VIDEO',
               'HAVE_WEBRTC_VOICE',
             ],
           },
           'dependencies': [
             '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
             '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
           ],
         }],
         ['OS=="linux"', {
-          'sources': [
-            'devices/libudevsymboltable.cc',
-            'devices/libudevsymboltable.h',
-            'devices/linuxdeviceinfo.cc',
-            'devices/linuxdevicemanager.cc',
-            'devices/linuxdevicemanager.h',
-            'devices/v4llookup.cc',
-            'devices/v4llookup.h',
-          ],
           'conditions': [
+            ['include_internal_device_management==1', {
+              'sources': [
+                'devices/libudevsymboltable.cc',
+                'devices/libudevsymboltable.h',
+                'devices/linuxdeviceinfo.cc',
+                'devices/linuxdevicemanager.cc',
+                'devices/linuxdevicemanager.h',
+                'devices/v4llookup.cc',
+                'devices/v4llookup.h',
+              ],
+              'include_dirs': [
+                'third_party/libudev'
+              ],
+            }],
             ['use_gtk==1', {
               'sources': [
                 'devices/gtkvideorenderer.cc',
                 'devices/gtkvideorenderer.h',
               ],
               'cflags': [
                 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)',
               ],
             }],
           ],
-          'include_dirs': [
-            'third_party/libudev'
-          ],
           'libraries': [

[kjellander_webrtc, 2016/02/15 16:38:40]

It seems this is not needed since compilation or rtc_media_unittests passes with
it removed. Is it safe to remove it in that case or could it be that it's only
used by classes that are not referenced by the test binary, so potentially else
may fail? I don't know which sources are referencing the library (or how to find
out).

[kjellander_webrtc, 2016/02/29 09:18:59]

Anyone know the answer to this?

[tommi, 2016/02/29 13:18:51]

I don't.  Could we try removing it in a separate CL and see if things stay
green?

             '-lrt',
           ],
         }],
         ['OS=="win"', {
           'sources': [
             'devices/gdivideorenderer.cc',
             'devices/gdivideorenderer.h',
-            'devices/win32deviceinfo.cc',
-            'devices/win32devicemanager.cc',
-            'devices/win32devicemanager.h',
           ],
           'msvs_settings': {
             'VCLibrarianTool': {
               'AdditionalDependencies': [
                 'd3d9.lib',

[kjellander_webrtc, 2016/02/15 16:38:40]

Same goes with these, rtc_media_unittests compiles with all of them removed.
Does that mean they're safe to remove or is it better to just keep them here
anyway?

[tommi, 2016/02/29 13:18:51]

Could be that there are other binaries that depend on it. However, if things
compile, it might be OK to remove.  My guess would be that some integration
tests on Windows might break due to missing IIDs.

                 'gdi32.lib',
                 'strmiids.lib',
                 'winmm.lib',
               ],
             },
           },
+          'conditions': [
+            ['include_internal_device_management==1', {
+              'sources': [
+                'devices/win32deviceinfo.cc',
+                'devices/win32devicemanager.cc',
+                'devices/win32devicemanager.h',
+              ],
+            }],
+          ],
         }],
         ['OS=="mac"', {
-          'sources': [
-            'devices/macdeviceinfo.cc',
-            'devices/macdevicemanager.cc',
-            'devices/macdevicemanager.h',
-            'devices/macdevicemanagermm.mm',
-          ],
           'conditions': [
+            ['include_internal_device_management==1', {
+              'sources': [
+                'devices/macdeviceinfo.cc',
+                'devices/macdevicemanager.cc',
+                'devices/macdevicemanager.h',
+                'devices/macdevicemanagermm.mm',
+              ],
+              'xcode_settings': {
+                'WARNING_CFLAGS': [
+                  # TODO(perkj): 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': [
+                    '-weak_framework AVFoundation',
+                    '-framework Cocoa',
+                    '-framework CoreAudio',
+                    '-framework CoreVideo',
+                    '-framework OpenGL',
+                    '-framework QTKit',
+                  ],
+                },
+              },
+            }],
             ['target_arch=="ia32"', {
               'sources': [
                 'devices/carbonvideorenderer.cc',
                 'devices/carbonvideorenderer.h',
               ],
               'link_settings': {
                 'xcode_settings': {
                   'OTHER_LDFLAGS': [
                     '-framework Carbon',
                   ],
                 },
               },
             }],
           ],
-          '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': [
-                '-weak_framework AVFoundation',
-                '-framework Cocoa',
-                '-framework CoreAudio',
-                '-framework CoreVideo',
-                '-framework OpenGL',
-                '-framework QTKit',
-              ],
-            },
-          },
         }],
         ['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',
           ],
@@ skipping 15 matching lines @@
         }],
         ['OS=="android"', {
           'sources': [
             'devices/mobiledevicemanager.cc',
           ],
         }],
       ],
     },  # target rtc_media
   ],  # targets.
 }