revert r430 to keep webrtc always ready to roll in chromium.

r430 will be used when libvpx in chromium is rolled to Cayuga.
Review URL: http://webrtc-codereview.appspot.com/119008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@431 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/video_coding/codecs/vp8/main/source/vp8.gyp

@@ -21,16 +21,29 @@
       ],
       'conditions': [
         ['build_with_chromium==1', {
-           'include_dirs': [
-             '../../../../../../../libvpx/source/libvpx',
-           ],
            'conditions': [
-             ['OS!="win"', {
+             ['target_arch=="arm"', {
-               # 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.
                'dependencies': [
-                 '../../../../../../../libvpx/libvpx.gyp:libvpx',
+                 '../../../../../../../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
                ],
              }],
            ],