From 12dbcd97984e74dcbfa8d07c8ae733da069d98dd Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 28 Aug 2012 20:34:57 +0000 Subject: [PATCH] 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 --- DEPS | 2 +- third_party/libvpx/libvpx.gyp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 4bc51b0c2d..b62040b14a 100644 --- a/DEPS +++ b/DEPS @@ -10,7 +10,7 @@ vars = { # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "143348", + "chromium_revision": "152335", # External resources like video and audio files used for testing purposes. # Downloaded on demand when needed. 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', ],