diff options
| author | fsamuel <fsamuel@chromium.org> | 2015-04-30 16:12:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-30 23:13:24 +0000 |
| commit | 9449f96ffd22a93d929b6fa034903c76f89fb754 (patch) | |
| tree | 1f8008d782b34f69c57aa95f628095447ff57ade /build/gyp_chromium | |
| parent | a28846d529a13efe227abd41f2a1c63e9be62271 (diff) | |
| download | chromium_src-9449f96ffd22a93d929b6fa034903c76f89fb754.zip chromium_src-9449f96ffd22a93d929b6fa034903c76f89fb754.tar.gz chromium_src-9449f96ffd22a93d929b6fa034903c76f89fb754.tar.bz2 | |
Disable circular gyp dependency check on Mac
It's very easy to get into a situation where components.gyp depends on content_shell_and_tests.gyp which depends on components.gyp. This CL gets rid of the check on Mac. The dependency check is now only performed on iOS.
BUG=none
Review URL: https://codereview.chromium.org/1106283004
Cr-Commit-Position: refs/heads/master@{#327826}
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index 4ed15ba..736062e 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -254,16 +254,18 @@ if __name__ == '__main__': else: args.append(os.path.join(script_dir, 'all.gyp')) + supplemental_includes = GetSupplementalFiles() + gyp_vars_dict = GetGypVars(supplemental_includes) # There shouldn't be a circular dependency relationship between .gyp files, # but in Chromium's .gyp files, on non-Mac platforms, circular relationships # currently exist. The check for circular dependencies is currently - # bypassed on other platforms, but is left enabled on the Mac, where a - # violation of the rule causes Xcode to misbehave badly. + # bypassed on other platforms, but is left enabled on iOS, where a violation + # of the rule causes Xcode to misbehave badly. # TODO(mark): Find and kill remaining circular dependencies, and remove this # option. http://crbug.com/35878. # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the # list. - if sys.platform not in ('darwin',): + if gyp_vars_dict.get('OS') != 'ios': args.append('--no-circular-check') # We explicitly don't support the make gyp generator (crbug.com/348686). Be @@ -285,9 +287,6 @@ if __name__ == '__main__': if syntax_check and int(syntax_check): args.append('--check') - supplemental_includes = GetSupplementalFiles() - gyp_vars_dict = GetGypVars(supplemental_includes) - # TODO(dmikurube): Remove these checks and messages after a while. if ('linux_use_tcmalloc' in gyp_vars_dict or 'android_use_tcmalloc' in gyp_vars_dict): |