admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision 48e079d573..33f87688e4 (407510:409700)

Browse Source 
Added symlink to third_party/closure_compiler to resolve Android GN error.

Change log: 48e079d573..33f87688e4
Full diff: 48e079d573..33f87688e4

Changed dependencies:
* src/buildtools: 60f7f9a8b4..88c6fc5bde
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/5440fe0cd1..0d1b0961f9
* src/third_party/ffmpeg: 24ea727552..4e878f7f64
* src/third_party/libsrtp: 720780acf8..48bdd208dc
* src/third_party/libvpx/source/libvpx: 4b073bc39a..82070ae939
* src/third_party/libyuv: e84dcb43bd..68786ccd53
* src/third_party/lss: 4fc942258f..3f6478ac95
* src/third_party/opus/src: 655cc54c56..aa32042a50
* src/third_party/usrsctp/usrsctplib: c60ec8b35c..9a3e5465e9
* src/tools/swarming_client: 7f63a272f7..e4288c3040
DEPS diff: 48e079d573..33f87688e4/DEPS

No update to Clang.

Skipping trybots since they already ran for https://codereview.webrtc.org/2210493004/ and this CL just adds a
fix for Android GN (which trybots were run).

TBR=marpan@webrtc.org,
BUG=webrtc:6169
NOTRY=True

Review-Url: https://codereview.webrtc.org/2215633002
Cr-Commit-Position: refs/heads/master@{#13632}
This commit is contained in:
kjellander 2016-08-04 00:00:37 -07:00 committed by Commit bot
parent 8cd8f81748
commit b419d6e965
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -86,6 +86,7 @@
/third_party/catapult /third_party/catapult
/third_party/clang_format /third_party/clang_format
/third_party/class-dump /third_party/class-dump
/third_party/closure_compiler
/third_party/colorama /third_party/colorama
/third_party/cygwin /third_party/cygwin
/third_party/directxsdk /third_party/directxsdk

2
DEPS
View File

@ -6,7 +6,7 @@
vars = { vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0', 'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': '48e079d573d6385fab6ad7110475a2b9da913bab', 'chromium_revision': '33f87688e4d164cf8f2ada5b4d01a04468807a11',
} }
# NOTE: Use http rather than https; the latter can cause problems for users # NOTE: Use http rather than https; the latter can cause problems for users

1
setup_links.py
View File

@ -94,6 +94,7 @@ if 'android' in target_os:
'third_party/ashmem', 'third_party/ashmem',
'third_party/bouncycastle', 'third_party/bouncycastle',
'third_party/catapult', 'third_party/catapult',
'third_party/closure_compiler',
'third_party/guava', 'third_party/guava',
'third_party/hamcrest', 'third_party/hamcrest',
'third_party/icu', 'third_party/icu',