diff options
| author | dpranke <dpranke@chromium.org> | 2015-04-21 17:49:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-22 00:49:48 +0000 |
| commit | f0b36803fc0c9789bec4b1ff0a4b242d84e39f06 (patch) | |
| tree | b05e2ffd253bf2c296e5946d14a1603181e69835 /build | |
| parent | 624cb4aecbf47bfc0f586f86206dc98e5aaf3e0a (diff) | |
| download | chromium_src-f0b36803fc0c9789bec4b1ff0a4b242d84e39f06.zip chromium_src-f0b36803fc0c9789bec4b1ff0a4b242d84e39f06.tar.gz chromium_src-f0b36803fc0c9789bec4b1ff0a4b242d84e39f06.tar.bz2 | |
Update 'gn_all' target in GYP to work on the mac.
TBR=brettw@chromium.org
BUG=461019
Review URL: https://codereview.chromium.org/1100833003
Cr-Commit-Position: refs/heads/master@{#326197}
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/gn_migration.gypi | 33 |
2 files changed, 22 insertions, 13 deletions
diff --git a/build/all.gyp b/build/all.gyp index 8f6295b..d0cef6c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -495,7 +495,7 @@ ], 'conditions': [ # TODO(GYP): make gn_migration.gypi work unconditionally. - ['OS=="win" or (OS=="linux" and target_arch=="x64" and chromecast==0)', { + ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch=="x64" and chromecast==0)', { 'includes': [ 'gn_migration.gypi', ], diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index a34b9ca..76d3b59 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -52,7 +52,6 @@ '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:load_library_perf_tests', '../chrome/chrome.gyp:performance_browser_tests', - '../chrome/chrome.gyp:service_discovery_sniffer', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_performance_tests', '../chrome/chrome.gyp:unit_tests', @@ -199,7 +198,6 @@ '../ui/display/display.gyp:display_unittests', '../ui/events/events.gyp:events_unittests', '../ui/gfx/gfx_tests.gyp:gfx_unittests', - '../ui/keyboard/keyboard.gyp:keyboard_unittests', '../ui/message_center/message_center.gyp:message_center_unittests', '../ui/snapshot/snapshot.gyp:snapshot_unittests', '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests', @@ -225,6 +223,11 @@ '../extensions/shell/app_shell.gyp:app_shell_unittests', ], }], + ['enable_mdns==1', { + 'dependencies': [ + '../chrome/chrome.gyp:service_discovery_sniffer', + ] + }], ['remoting==1', { 'dependencies': [ '../remoting/remoting_all.gyp:remoting_all', @@ -259,6 +262,7 @@ '../ui/aura/aura.gyp:aura_bench', '../ui/aura/aura.gyp:aura_demo', '../ui/aura/aura.gyp:aura_unittests', + '../ui/keyboard/keyboard.gyp:keyboard_unittests', '../ui/wm/wm.gyp:wm_unittests', ], }], @@ -365,6 +369,16 @@ '../rlz/rlz.gyp:rlz_unittests', ], }], + ['OS=="android" or OS=="linux" or os_bsd==1', { + 'dependencies': [ + '../breakpad/breakpad.gyp:core-2-minidump', + '../breakpad/breakpad.gyp:microdump_stackwalk', + '../breakpad/breakpad.gyp:minidump_dump', + '../breakpad/breakpad.gyp:minidump_stackwalk', + '../breakpad/breakpad.gyp:symupload', + '../third_party/codesighs/codesighs.gyp:nm2tsv', + ], + }], ['OS=="linux"', { 'dependencies': [ '../breakpad/breakpad.gyp:breakpad_unittests', @@ -463,15 +477,6 @@ '../third_party/pdfium/samples/samples.gyp:pdfium_diff', '../win8/win8.gyp:metro_viewer', ], - }, { - 'dependencies': [ - '../breakpad/breakpad.gyp:core-2-minidump', - '../breakpad/breakpad.gyp:microdump_stackwalk', - '../breakpad/breakpad.gyp:minidump_dump', - '../breakpad/breakpad.gyp:minidump_stackwalk', - '../breakpad/breakpad.gyp:symupload', - '../third_party/codesighs/codesighs.gyp:nm2tsv', - ], }], ], }, @@ -669,7 +674,6 @@ 'type': 'none', 'dependencies': [ 'All', - 'aura_builder', 'blink_tests', 'chromium_builder_asan', 'chromium_builder_chromedriver', @@ -680,6 +684,11 @@ 'chromium_gpu_debug_builder', ], 'conditions': [ + ['use_aura==1', { + 'dependencies': [ + 'aura_builder', + ] + }], ['OS=="win"', { 'dependencies': [ 'chromium_builder', |