From 34a7054fd68b0347e60c7529ae94b868a190f255 Mon Sep 17 00:00:00 2001 From: kjellander Date: Sun, 6 Dec 2015 10:32:34 -0800 Subject: [PATCH] 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} --- .gn | 1 + DEPS | 2 +- setup_links.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gn b/.gn index d078116168..4689803a31 100644 --- a/.gn +++ b/.gn @@ -35,6 +35,7 @@ exec_script_whitelist = [ "//build/config/linux/pkg_config.gni", "//build/config/mac/mac_sdk.gni", "//build/config/posix/BUILD.gn", + "//build/config/sysroot.gni", "//build/config/win/visual_studio_version.gni", "//build/gn_helpers.py", "//build/gypi_to_gn.py", diff --git a/DEPS b/DEPS index a17971a407..a7546a98eb 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '626eecf82054e5c47bfa987a5622918d56557cbc', + 'chromium_revision': '72c32651dadfa9de98f366de58cd407fbc68d6bd', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than 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')