From ddbe6492536f9632e528555f20c8ae378e00b761 Mon Sep 17 00:00:00 2001
From: "ronghuawu@google.com"
 <ronghuawu@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 15 Jul 2011 21:16:03 +0000
Subject: [PATCH] The libvpx in chromium doesn't support the ARM build, so we
 have to use the pre-built libvpx instead.

Ref: http://src.chromium.org/viewvc/chrome/trunk/src/remoting/remoting.gyp?view=markup
Review URL: http://webrtc-codereview.appspot.com/74006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@218 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../codecs/vp8/main/source/vp8.gyp            | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp b/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
index a4a32fe517..808b258b75 100644
--- a/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
+++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
@@ -21,23 +21,32 @@
       ],
       'conditions': [
         ['build_with_chromium==1', {
-          'conditions': [
-            ['OS=="win"', {
-              'dependencies': [
-                # We don't want to link with the static library inside Chromium
-                # on Windows. Chromium uses the ffmpeg DLL and exports the
-                # necessary libvpx symbols for us.
-                '../../../../../../../libvpx/libvpx.gyp:libvpx_include',
-              ],
-            },{
-              'dependencies': [
-                '../../../../../../../libvpx/libvpx.gyp:libvpx',
-              ],
-              'include_dirs': [
-                '../../../../../../../libvpx/source/libvpx',
-              ],
-            }],
-          ],
+           'conditions': [
+             ['target_arch=="arm"', {
+               'dependencies': [
+                 '../../../../../../../libvpx/libvpx.gyp:libvpx_lib',
+                 '../../../../../../../libvpx/libvpx.gyp:libvpx_include',
+               ],
+             }, {  # arm
+               'conditions': [
+                 ['OS=="win"', {
+                   'dependencies': [
+                     # We don't want to link with the static library inside Chromium
+                     # on Windows. Chromium uses the ffmpeg DLL and exports the
+                     # necessary libvpx symbols for us.
+                     '../../../../../../../libvpx/libvpx.gyp:libvpx_include',
+                   ],
+                 },{ # non-arm, win
+                   'dependencies': [
+                     '../../../../../../../libvpx/libvpx.gyp:libvpx',
+                   ],
+                   'include_dirs': [
+                     '../../../../../../../libvpx/source/libvpx',
+                   ],
+                 }], # non-arm, non-win
+               ],
+             }],
+           ],
         },{
           'dependencies': [
             '../../../../../../../third_party/libvpx/libvpx.gyp:libvpx',