From 2037fa4d0d3e632fec236549455f9e39d94170d9 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Tue, 20 Dec 2016 11:26:53 +0100 Subject: [PATCH] setup_links.py: Always link to base + cleanup. This is needed to unblock the migration away from Chromium checkouts. With the existing base/third_party/libevent link, trybots fail patching base/ BUG=webrtc:5006 TBR=charujain@webrtc.org Review-Url: https://codereview.webrtc.org/2595483002 . Cr-Commit-Position: refs/heads/master@{#15704} --- setup_links.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/setup_links.py b/setup_links.py index 6856ec617f..ac6865be44 100755 --- a/setup_links.py +++ b/setup_links.py @@ -29,6 +29,7 @@ import textwrap DIRECTORIES = [ + 'base', 'build', 'buildtools', 'testing', @@ -42,7 +43,6 @@ DIRECTORIES = [ 'third_party/ffmpeg', 'third_party/instrumented_libraries', 'third_party/jsoncpp', - 'third_party/libc++-static', 'third_party/libFuzzer', 'third_party/libjpeg', 'third_party/libjpeg_turbo', @@ -82,13 +82,11 @@ from sync_chromium import get_target_os_list target_os = get_target_os_list() if 'android' in target_os: DIRECTORIES += [ - 'base', 'third_party/accessibility_test_framework', 'third_party/android_platform', 'third_party/android_support_test_runner', 'third_party/android_tools', 'third_party/apache_velocity', - 'third_party/appurify-python', 'third_party/ashmem', 'third_party/bouncycastle', 'third_party/byte_buddy', @@ -113,18 +111,9 @@ if 'android' in target_os: 'third_party/sqlite4java', 'third_party/tcmalloc', 'tools/android', - 'tools/telemetry', ] -else: - DIRECTORIES += [ - 'base/third_party/libevent', - ] - -if 'ios' in target_os: - DIRECTORIES.append('third_party/class-dump') FILES = { - 'tools/isolate_driver.py': None, 'third_party/BUILD.gn': None, }