OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
9 }, | 9 }, |
10 'includes': [ | 10 'includes': [ |
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
834 '../ui/compositor/compositor.gyp:compositor_test_support', | 834 '../ui/compositor/compositor.gyp:compositor_test_support', |
835 '../ui/events/events.gyp:events', | 835 '../ui/events/events.gyp:events', |
836 '../ui/events/events.gyp:events_test_support', | 836 '../ui/events/events.gyp:events_test_support', |
837 '../ui/gfx/gfx.gyp:gfx', | 837 '../ui/gfx/gfx.gyp:gfx', |
838 '../ui/gfx/gfx.gyp:gfx_geometry', | 838 '../ui/gfx/gfx.gyp:gfx_geometry', |
839 '../ui/keyboard/keyboard.gyp:keyboard', | 839 '../ui/keyboard/keyboard.gyp:keyboard', |
840 '../ui/message_center/message_center.gyp:message_center', | 840 '../ui/message_center/message_center.gyp:message_center', |
841 '../ui/message_center/message_center.gyp:message_center_test_support', | 841 '../ui/message_center/message_center.gyp:message_center_test_support', |
842 '../ui/resources/ui_resources.gyp:ui_resources', | 842 '../ui/resources/ui_resources.gyp:ui_resources', |
843 '../ui/ui_unittests.gyp:ui_test_support', | 843 '../ui/ui_unittests.gyp:ui_test_support', |
844 '../ui/views/controls/webview/webview_tests.gyp:webview_test_support', | |
845 '../ui/views/examples/examples.gyp:views_examples_with_content_lib', | |
tapted
2014/03/16 23:45:49
Having ash_unittests depending on examples.gyp fee
tfarina
2014/03/17 01:33:09
I will try removing it and see what happens.
This
Ben Goodger (Google)
2014/03/18 15:59:03
Should work without it. Only ash_shell needs examp
tfarina
2014/03/19 04:34:18
Done.
tfarina
2014/03/19 14:18:06
Actually I reverted this change, see below why:
I
| |
844 '../ui/views/views.gyp:views', | 846 '../ui/views/views.gyp:views', |
845 '../ui/views/views.gyp:views_examples_with_content_lib', | |
846 '../ui/views/views.gyp:views_test_support', | 847 '../ui/views/views.gyp:views_test_support', |
847 '../ui/views/views.gyp:views_with_content_test_support', | |
848 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', | 848 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', |
849 '../ui/wm/wm.gyp:wm_core', | 849 '../ui/wm/wm.gyp:wm_core', |
850 '../url/url.gyp:url_lib', | 850 '../url/url.gyp:url_lib', |
851 'ash_strings.gyp:ash_strings', | 851 'ash_strings.gyp:ash_strings', |
852 'ash', | 852 'ash', |
853 'ash_resources', | 853 'ash_resources', |
854 'ash_test_support', | 854 'ash_test_support', |
855 'ash_with_content', | 855 'ash_with_content', |
856 ], | 856 ], |
857 'sources': [ | 857 'sources': [ |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1067 '../ui/app_list/app_list.gyp:app_list', | 1067 '../ui/app_list/app_list.gyp:app_list', |
1068 '../ui/aura/aura.gyp:aura', | 1068 '../ui/aura/aura.gyp:aura', |
1069 '../ui/base/ui_base.gyp:ui_base', | 1069 '../ui/base/ui_base.gyp:ui_base', |
1070 '../ui/compositor/compositor.gyp:compositor', | 1070 '../ui/compositor/compositor.gyp:compositor', |
1071 '../ui/events/events.gyp:events', | 1071 '../ui/events/events.gyp:events', |
1072 '../ui/gfx/gfx.gyp:gfx', | 1072 '../ui/gfx/gfx.gyp:gfx', |
1073 '../ui/gfx/gfx.gyp:gfx_geometry', | 1073 '../ui/gfx/gfx.gyp:gfx_geometry', |
1074 '../ui/keyboard/keyboard.gyp:keyboard', | 1074 '../ui/keyboard/keyboard.gyp:keyboard', |
1075 '../ui/message_center/message_center.gyp:message_center', | 1075 '../ui/message_center/message_center.gyp:message_center', |
1076 '../ui/resources/ui_resources.gyp:ui_resources', | 1076 '../ui/resources/ui_resources.gyp:ui_resources', |
1077 '../ui/views/examples/examples.gyp:views_examples_lib', | |
1078 '../ui/views/examples/examples.gyp:views_examples_with_content_lib', | |
1077 '../ui/views/views.gyp:views', | 1079 '../ui/views/views.gyp:views', |
1078 '../ui/views/views.gyp:views_examples_lib', | |
1079 '../ui/views/views.gyp:views_examples_with_content_lib', | |
1080 '../ui/views/views.gyp:views_test_support', | 1080 '../ui/views/views.gyp:views_test_support', |
1081 'ash', | 1081 'ash', |
1082 'ash_resources', | 1082 'ash_resources', |
1083 'ash_with_content', | 1083 'ash_with_content', |
1084 ], | 1084 ], |
1085 'sources': [ | 1085 'sources': [ |
1086 'session_state_delegate_stub.cc', | 1086 'session_state_delegate_stub.cc', |
1087 'session_state_delegate_stub.h', | 1087 'session_state_delegate_stub.h', |
1088 'shell/app_list.cc', | 1088 'shell/app_list.cc', |
1089 'shell/bubble.cc', | 1089 'shell/bubble.cc', |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1133 }], | 1133 }], |
1134 ['chromeos==1', { | 1134 ['chromeos==1', { |
1135 'dependencies': [ | 1135 'dependencies': [ |
1136 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1136 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
1137 ], | 1137 ], |
1138 }], | 1138 }], |
1139 ], | 1139 ], |
1140 }, | 1140 }, |
1141 ], | 1141 ], |
1142 } | 1142 } |
OLD | NEW |