diff options
| author | Henrik Kjellander <kjellander@webrtc.org> | 2015-06-09 14:56:20 +0200 |
|---|---|---|
| committer | Henrik Kjellander <kjellander@webrtc.org> | 2015-06-09 12:56:29 +0000 |
| commit | 94a12324841629749cadc60d91ced8e93e88ff1d (patch) | |
| tree | 7aa77faa82337b5055867c2b5775e7ffba89613f | |
| parent | 1b76ca121ed820495b3ae238e06df0728b42ece9 (diff) | |
| download | webrtc-94a12324841629749cadc60d91ced8e93e88ff1d.tar.gz | |
Roll chromium_revision b2c6a86..e937e5f (332773:333350)
Add symlink to third_party/android_platform to handle changes in
https://codereview.chromium.org/1072533002
Relevant changes:
* src/third_party/boringssl/src: 8a228f5..af0e32c
* src/third_party/icu: f1ad7f9..9939a5d
* src/third_party/libvpx: 654e661..a436311
* src/third_party/libyuv: 35aa92a..632c50f
* src/tools/gyp: 29e94a3..fdc7b81
Details: https://chromium.googlesource.com/chromium/src/+/b2c6a86..e937e5f/DEPS
Clang version was not updated in this roll.
BUG=
R=pbos@webrtc.org
Review URL: https://codereview.webrtc.org/1169083002.
Cr-Commit-Position: refs/heads/master@{#9400}
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | DEPS | 2 | ||||
| -rwxr-xr-x | setup_links.py | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 9c328ecdab..4472ae3d04 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ /talk/app/webrtc/androidtests/libs /testing /third_party/WebKit/Tools/Scripts +/third_party/android_platform /third_party/android_testrunner /third_party/android_tools /third_party/appurify-python @@ -87,6 +88,7 @@ /third_party/boringssl /third_party/BUILD.gn /third_party/clang_format +/third_party/class-dump /third_party/colorama /third_party/cygwin /third_party/directxsdk @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'b2c6a8612f762f45671fb87331e89552e561833a', + 'chromium_revision': 'e937e5fb5e6136ef27280fc7aad5502aa5a3cce2', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/setup_links.py b/setup_links.py index 1edb7c238e..cca14d1df6 100755 --- a/setup_links.py +++ b/setup_links.py @@ -80,6 +80,7 @@ target_os = get_target_os_list() if 'android' in target_os: DIRECTORIES += [ 'base', + 'third_party/android_platform', 'third_party/android_testrunner', 'third_party/android_tools', 'third_party/appurify-python', |