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

Roll chromium_revision 6455c69..deaf2f7 (293954:295079)

Browse Source 
Mainly to pick up recent yasm changes needed for
turning on libvpx in GN.

Summary of changes (git diff 6455c69..deaf2f7 DEPS):
* third_party/boringssl 7bdec13..a70c75c
* third_party/libjpeg_turbo 3963fbc..034e9a9
* third_party/libvpx d95585f..4947d55
* tools/gyp 1972:1977

I had to add src/third_party/junit/src to be ignored
due to http://crbug.com/417292.

BUG=3855, chromium:417292
TBR=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/27539004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7313 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-09-27 18:10:30 +00:00
parent bebc75e8bd
commit 3902054b58
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -12,7 +12,7 @@ vars = {
# Use this googlecode_url variable only if there is an internal mirror for it. # Use this googlecode_url variable only if there is an internal mirror for it.
# 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_revision": "6455c698e51af65f57a8fe83547296218a5a7251", "chromium_revision": "deaf2f7e812fd2bb8e0387491d0d080d1e1fe61e",
} }
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

1
chromium/.gclient
View File

@ -10,6 +10,7 @@ solutions = [{
'src/chrome/tools/test/reference_build/chrome_win': None, 'src/chrome/tools/test/reference_build/chrome_win': None,
'src/native_client': None, 'src/native_client': None,
'src/third_party/ffmpeg': None, 'src/third_party/ffmpeg': None,
'src/third_party/junit/src': None,
'src/third_party/WebKit': None, 'src/third_party/WebKit': None,
'src/v8': None, 'src/v8': None,
}, },

1
webrtc/webrtc_examples.gyp
View File

@ -7,6 +7,7 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': ['build/common.gypi'], 'includes': ['build/common.gypi'],
'targets': [],
'conditions': [ 'conditions': [
['OS=="android"', { ['OS=="android"', {
'targets': [ 'targets': [