diff --git a/all.gyp b/all.gyp
index c41988025a..21cc8b519d 100644
--- a/all.gyp
+++ b/all.gyp
@@ -26,9 +26,16 @@
             'webrtc/webrtc_examples.gyp:*',
           ],
         }],
-        ['(OS=="ios" or (OS=="mac" and target_arch!="ia32")) and include_tests==1', {
+        ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
           'dependencies': [
-            'talk/app/webrtc/legacy_objc_api_tests.gyp:*',
+            'talk/app/webrtc/legacy_objc_api.gyp:*',
+          ],
+          'conditions': [
+            ['include_tests==1', {
+              'dependencies': [
+                'talk/app/webrtc/legacy_objc_api_tests.gyp:*',
+              ],
+            }],
           ],
         }],
       ],
diff --git a/webrtc/modules/video_coding/codecs/h264/h264.gypi b/webrtc/modules/video_coding/codecs/h264/h264.gypi
index 3fe032aa80..1d493daa98 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -62,9 +62,6 @@
         {
           'target_name': 'webrtc_h264_video_toolbox',
           'type': 'static_library',
-          'dependencies': [
-            '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
-          ],
           'link_settings': {
             'xcode_settings': {
               'OTHER_LDFLAGS': [
@@ -83,6 +80,11 @@
             'h264_video_toolbox_nalu.cc',
             'h264_video_toolbox_nalu.h',
           ],
+          'conditions': [
+            ['build_libyuv==1', {
+              'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv'],
+            }],
+          ],
         }, # webrtc_h264_video_toolbox
       ], # targets
     }], # OS=="ios"