From 7a52ca7a1f90ac3cfe5686c91c07b88fb3ef4c07 Mon Sep 17 00:00:00 2001
From: jfroy <jfroy@chromium.org>
Date: Tue, 2 Jun 2015 15:17:58 -0700
Subject: Fix dependencies for iOS build of //media/cast.

BUG=

Review URL: https://codereview.chromium.org/1146063007

Cr-Commit-Position: refs/heads/master@{#332478}
---
 media/cast/BUILD.gn | 10 ++++------
 media/cast/cast.gyp |  8 +-------
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'media/cast')

diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn
index 48c3bc3..7923063 100644
--- a/media/cast/BUILD.gn
+++ b/media/cast/BUILD.gn
@@ -176,12 +176,10 @@ source_set("sender") {
       "sender/h264_vt_encoder.h",
     ]
 
-    libs += [ "CoreVideo.framework" ]
-  }
-
-  if (is_mac) {
-    # Required by audio_encoder.cc.
-    libs += [ "AudioToolbox.framework" ]
+    libs += [
+      "AudioToolbox.framework",
+      "CoreVideo.framework",
+    ]
   }
 }
 
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
index e3cb136..71ba2f0 100644
--- a/media/cast/cast.gyp
+++ b/media/cast/cast.gyp
@@ -205,17 +205,11 @@
           ],
           'link_settings': {
             'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
             ],
           },
         }],  # OS=="ios" or OS=="mac"
-        ['OS=="mac"', {
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
-            ],
-          },
-        }],  # OS=="mac"
       ], # conditions
     },
     {
-- 
cgit v1.1