diff options
| -rw-r--r-- | chrome/chrome.isolate | 7 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 3 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 1 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 1 | ||||
| -rwxr-xr-x | tools/isolate_driver.py | 5 |
5 files changed, 1 insertions, 16 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index c628c30..e4dd9ef 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -77,13 +77,6 @@ ], }, }], - ['OS=="mac" and component=="shared_library"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/libchrome_main_dll.dylib', - ], - }, - }], ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 9971155..7d0c082 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2758,9 +2758,6 @@ 'browser/sync/test/integration/single_client_dictionary_sync_test.cc', 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', ], - 'dependencies': [ - 'chrome', - ], }], ['OS=="win"', { 'sources': [ diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 86cfe90..0e37609 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -145,6 +145,5 @@ 'includes': [ '../base/base.isolate', '../gin/v8.isolate', - 'chrome.isolate', ], } diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 0c01741..3ff1056 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -116,6 +116,5 @@ '../base/base.isolate', '../gin/v8.isolate', '../third_party/angle/angle.isolate', - 'chrome.isolate', ], } diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py index f51b824..6c9f118 100755 --- a/tools/isolate_driver.py +++ b/tools/isolate_driver.py @@ -24,7 +24,6 @@ import json import logging import os import posixpath -import re import StringIO import subprocess import sys @@ -142,9 +141,7 @@ def raw_build_to_deps(item): # TODO(maruel): Use a whitelist instead? .stamp, .so.TOC, .dylib.TOC, # .dll.lib, .exe and empty. # The first item is the build rule, e.g. 'link', 'cxx', 'phony', etc. - # In ninja build files, spaces in targets are escaped with a $-prefix. - # Use a negative lookbehind to not split on '$ '. - return filter(using_blacklist, re.split('(?<!\$) ', item)[1:]) + return filter(using_blacklist, item.split(' ')[1:]) def collect_deps(target, build_steps, dependencies_added, rules_seen): |