diff options
author | kjellander <kjellander@webrtc.org> | 2015-12-06 10:32:34 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-06 18:32:42 +0000 |
commit | 34a7054fd68b0347e60c7529ae94b868a190f255 (patch) | |
tree | f9ae05ba2693a6f1f5785648aeade0d4429cf044 /setup_links.py | |
parent | 1218d7ad2fac035376914bd0649fe99e657b33d3 (diff) | |
download | webrtc-34a7054fd68b0347e60c7529ae94b868a190f255.tar.gz |
Roll chromium_revision 626eecf..72c3265 (363027:363365)
https://chromium.googlesource.com/chromium/src/+/0c2a94ab87e6351b924a19932442e85a8f786fa0
needed the addition of tools/telemetry and third_party/catapult symlinks
for Android.
GN changes required modification of .gn.
Change log: https://chromium.googlesource.com/chromium/src/+log/626eecf..72c3265
Full diff: https://chromium.googlesource.com/chromium/src/+/626eecf..72c3265
Changed dependencies:
* src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/818123d..b747a9e
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/fde89b4..6d9e5a7
DEPS diff: https://chromium.googlesource.com/chromium/src/+/626eecf..72c3265/DEPS
No update to Clang.
TBR=
NOTRY=True
Review URL: https://codereview.webrtc.org/1503883002
Cr-Commit-Position: refs/heads/master@{#10904}
Diffstat (limited to 'setup_links.py')
-rwxr-xr-x | setup_links.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/setup_links.py b/setup_links.py index f985e80f14..4ef40ead0a 100755 --- a/setup_links.py +++ b/setup_links.py @@ -85,6 +85,7 @@ if 'android' in target_os: 'third_party/android_tools', 'third_party/appurify-python', 'third_party/ashmem', + 'third_party/catapult', 'third_party/icu', 'third_party/ijar', 'third_party/jsr-305', @@ -97,6 +98,7 @@ if 'android' in target_os: 'third_party/robolectric', 'tools/android', 'tools/grit', + 'tools/telemetry', ] if 'ios' in target_os: DIRECTORIES.append('third_party/class-dump') |