From 810c1791cc0f32ad1fafa7239977a480533cf2ef Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 18 Feb 2016 15:30:23 -0800 Subject: [PATCH] symlinks for android launcher Based on webrtc roll https://codereview.webrtc.org/1503883002 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 TBR=jkellander@chromium.org BUG=libyuv:570 Review URL: https://codereview.chromium.org/1709193002 . --- .gn | 1 + setup_links.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gn b/.gn index bc19d4b6c..b1386c9a7 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/setup_links.py b/setup_links.py index 99b526076..975ef9047 100755 --- a/setup_links.py +++ b/setup_links.py @@ -87,6 +87,7 @@ if 'android' in target_os: 'third_party/android_tools', 'third_party/appurify-python', 'third_party/ashmem', + 'third_party/catapult', 'third_party/ijar', 'third_party/jsr-305', 'third_party/junit', @@ -98,7 +99,8 @@ if 'android' in target_os: 'third_party/robolectric', 'tools/android', 'tools/grit', - 'tools/relocation_packer' + 'tools/relocation_packer', + 'tools/telemetry', ] if 'ios' in target_os: DIRECTORIES.append('third_party/class-dump')