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', ],