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

webrtc/media/media.gyp

Index: webrtc/media/media.gyp
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index e4960e16c9b48f5a8a2b4cbcd212cba60baf00c2..0e55848939e9a2005da5efb61e8eb0690b94d51b 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -77,9 +77,6 @@
         '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.

@@ -124,6 +121,17 @@
         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',],
         }],
@@ -159,16 +167,21 @@
           ],
         }],
         ['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',
@@ -179,9 +192,6 @@
               ],
             }],
           ],
-          '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',
           ],
@@ -190,9 +200,6 @@
           'sources': [
             'devices/gdivideorenderer.cc',
             'devices/gdivideorenderer.h',
-            'devices/win32deviceinfo.cc',
-            'devices/win32devicemanager.cc',
-            'devices/win32devicemanager.h',
           ],
           'msvs_settings': {
             'VCLibrarianTool': {
@@ -204,15 +211,49 @@
               ],
             },
           },
+          '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',
@@ -227,29 +268,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': [
-                '-weak_framework AVFoundation',
-                '-framework Cocoa',
-                '-framework CoreAudio',
-                '-framework CoreVideo',
-                '-framework OpenGL',
-                '-framework QTKit',
-              ],
-            },
-          },
         }],
         ['OS=="ios"', {
           'sources': [