Propagate HAVE_WEBRTC_VIDEO and HAVE_WEBRTC_VIDEO gyp settings.

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 116 matching lines @@
         }],
         ['build_with_chromium==1', {
           'dependencies': [
             '<(webrtc_root)/modules/modules.gyp:video_capture',
           ],
         }, {
           'defines': [
             'HAVE_WEBRTC_VIDEO',
             'HAVE_WEBRTC_VOICE',
           ],
-          'direct_dependent_settings': {
+          'all_dependent_settings': {
             'defines': [
               'HAVE_WEBRTC_VIDEO',
               'HAVE_WEBRTC_VOICE',
             ],
           },
           'dependencies': [
             '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
           ],
         }],
         ['OS=="linux" and use_gtk==1', {
@@ skipping 99 matching lines @@
             'engine/fakewebrtcvoiceengine.h',
           ],
         },  # target rtc_unittest_main
         {
           'target_name': 'rtc_media_unittests',
           'type': 'executable',
           'dependencies': [
             '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
             '<(webrtc_root)/test/test.gyp:test_support',
             'rtc_unittest_main',

[kjellander_webrtc, 2016/08/22 09:37:46]

I'd prefer if you add a dependency on 'rtc_media' here instead.

[nisse-webrtc, 2016/08/22 09:45:45]

Done.

           ],
           'sources': [
             'base/codec_unittest.cc',
             'base/rtpdataengine_unittest.cc',
             'base/rtpdump_unittest.cc',
             'base/rtputils_unittest.cc',
             'base/streamparams_unittest.cc',
             'base/turnutils_unittest.cc',
             'base/videoadapter_unittest.cc',
             'base/videobroadcaster_unittest.cc',
@@ skipping 88 matching lines @@
               'sources': [
                 'rtc_media_unittests.isolate',
               ],
             },
           ],
         }],
       ],  # conditions
     }],  # include_tests==1
   ],  # conditions
 }