aboutsummaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2012-08-28 20:34:57 +0000
committerandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2012-08-28 20:34:57 +0000
commit12dbcd97984e74dcbfa8d07c8ae733da069d98dd (patch)
tree9abaae34c9a61db0c3b85be928df4657623540a1 /third_party
parenta4fa46108c3392a1242f9cecbedfcff26b57914e (diff)
downloadwebrtc-12dbcd97984e74dcbfa8d07c8ae733da069d98dd.tar.gz
Roll Chromium 143348:152335.
Fix libvpx-Android build error. Review URL: https://webrtc-codereview.appspot.com/760004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2680 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libvpx/libvpx.gyp6
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp
index 3b76da46b7..7323131d6e 100644
--- a/third_party/libvpx/libvpx.gyp
+++ b/third_party/libvpx/libvpx.gyp
@@ -229,10 +229,8 @@
],
}],
['OS == "android"', {
- 'include_dirs': [
- '<(android_ndk_include)',
- '<(android_ndk_include)/machine',
- ],
+ # TODO(andrew): include_dirs block removed here. Should likely be
+ # upstreamed.
'defines': [
'ANDROID_CPU_ARM_FEATURE_NEON=4',
],