generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll Chromium 143348:152335.

Browse Source 
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:
andrew@webrtc.org 2012-08-28 20:34:57 +00:00
parent a4fa46108c
commit 12dbcd9798
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -10,7 +10,7 @@ vars = {
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn", "googlecode_url": "http://%s.googlecode.com/svn",
"chromium_trunk" : "http://src.chromium.org/svn/trunk", "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. # External resources like video and audio files used for testing purposes.
# Downloaded on demand when needed. # Downloaded on demand when needed.

6
third_party/libvpx/libvpx.gyp vendored
View File

@ -229,10 +229,8 @@
], ],
}], }],
['OS == "android"', { ['OS == "android"', {
'include_dirs': [ # TODO(andrew): include_dirs block removed here. Should likely be
'<(android_ndk_include)', # upstreamed.
'<(android_ndk_include)/machine',
],
'defines': [ 'defines': [
'ANDROID_CPU_ARM_FEATURE_NEON=4', 'ANDROID_CPU_ARM_FEATURE_NEON=4',
], ],