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
This commit is contained in:
parent
a4fa46108c
commit
12dbcd9798
2
DEPS
2
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.
|
||||
|
6
third_party/libvpx/libvpx.gyp
vendored
6
third_party/libvpx/libvpx.gyp
vendored
@ -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',
|
||||
],
|
||||
|
Loading…
x
Reference in New Issue
Block a user