Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(611)

Unified Diff: build/gn_migration.gypi

Issue 1100833003: Update 'gn_all' target in GYP to work on the mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index a34b9cac015225f1c8df5fc42e3536114081947d..76d3b59aa5681a9bc1a325060fa173deb709d867 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',
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698