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

Side by Side Diff: ash/ash.gyp

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | build/temp_gyp/googleurl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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': [
11 'ash_resources.gypi', 11 'ash_resources.gypi',
12 ], 12 ],
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'ash', 15 'target_name': 'ash',
16 'type': '<(component)', 16 'type': '<(component)',
17 'dependencies': [ 17 'dependencies': [
18 'ash_strings.gyp:ash_strings',
19 '../base/base.gyp:base', 18 '../base/base.gyp:base',
20 '../base/base.gyp:base_i18n', 19 '../base/base.gyp:base_i18n',
21 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 20 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
22 '../build/temp_gyp/googleurl.gyp:googleurl',
23 '../cc/cc.gyp:cc', 21 '../cc/cc.gyp:cc',
24 '../content/content.gyp:content', 22 '../content/content.gyp:content',
25 '../content/content.gyp:content_browser', 23 '../content/content.gyp:content_browser',
26 '../ipc/ipc.gyp:ipc', 24 '../ipc/ipc.gyp:ipc',
27 '../net/net.gyp:net', 25 '../net/net.gyp:net',
28 '../skia/skia.gyp:skia', 26 '../skia/skia.gyp:skia',
29 '../third_party/icu/icu.gyp:icui18n', 27 '../third_party/icu/icu.gyp:icui18n',
30 '../third_party/icu/icu.gyp:icuuc', 28 '../third_party/icu/icu.gyp:icuuc',
31 '../ui/app_list/app_list.gyp:app_list', 29 '../ui/app_list/app_list.gyp:app_list',
32 '../ui/aura/aura.gyp:aura', 30 '../ui/aura/aura.gyp:aura',
33 '../ui/base/strings/ui_strings.gyp:ui_strings', 31 '../ui/base/strings/ui_strings.gyp:ui_strings',
34 '../ui/compositor/compositor.gyp:compositor', 32 '../ui/compositor/compositor.gyp:compositor',
33 '../ui/keyboard/keyboard.gyp:keyboard',
35 '../ui/message_center/message_center.gyp:message_center', 34 '../ui/message_center/message_center.gyp:message_center',
36 '../ui/oak/oak.gyp:oak', 35 '../ui/oak/oak.gyp:oak',
37 '../ui/ui.gyp:ui', 36 '../ui/ui.gyp:ui',
38 '../ui/ui.gyp:ui_resources', 37 '../ui/ui.gyp:ui_resources',
39 '../ui/views/controls/webview/webview.gyp:webview', 38 '../ui/views/controls/webview/webview.gyp:webview',
40 '../ui/views/views.gyp:views', 39 '../ui/views/views.gyp:views',
41 '../ui/keyboard/keyboard.gyp:keyboard',
42 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 40 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
41 '../url/url.gyp:url_lib',
42 'ash_strings.gyp:ash_strings',
43 'ash_resources', 43 'ash_resources',
44 'ash_wallpaper_resources', 44 'ash_wallpaper_resources',
45 ], 45 ],
46 'defines': [ 46 'defines': [
47 'ASH_IMPLEMENTATION', 47 'ASH_IMPLEMENTATION',
48 ], 48 ],
49 'sources': [ 49 'sources': [
50 # All .cc, .h under ash, except unittests 50 # All .cc, .h under ash, except unittests
51 'accelerators/accelerator_controller.cc', 51 'accelerators/accelerator_controller.cc',
52 'accelerators/accelerator_controller.h', 52 'accelerators/accelerator_controller.h',
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 'test/test_metro_viewer_process_host.cc', 587 'test/test_metro_viewer_process_host.cc',
588 'test/test_metro_viewer_process_host.h', 588 'test/test_metro_viewer_process_host.h',
589 ], 589 ],
590 }], 590 }],
591 ], 591 ],
592 }, 592 },
593 { 593 {
594 'target_name': 'ash_unittests', 594 'target_name': 'ash_unittests',
595 'type': 'executable', 595 'type': 'executable',
596 'dependencies': [ 596 'dependencies': [
597 'ash_strings.gyp:ash_strings',
598 '../base/base.gyp:base', 597 '../base/base.gyp:base',
599 '../base/base.gyp:test_support_base', 598 '../base/base.gyp:test_support_base',
600 '../chrome/chrome_resources.gyp:packed_resources', 599 '../chrome/chrome_resources.gyp:packed_resources',
601 '../content/content.gyp:content_browser', 600 '../content/content.gyp:content_browser',
602 '../content/content.gyp:test_support_content', 601 '../content/content.gyp:test_support_content',
603 '../build/temp_gyp/googleurl.gyp:googleurl',
604 '../skia/skia.gyp:skia', 602 '../skia/skia.gyp:skia',
605 '../testing/gtest.gyp:gtest', 603 '../testing/gtest.gyp:gtest',
606 '../third_party/icu/icu.gyp:icui18n', 604 '../third_party/icu/icu.gyp:icui18n',
607 '../third_party/icu/icu.gyp:icuuc', 605 '../third_party/icu/icu.gyp:icuuc',
606 '../ui/app_list/app_list.gyp:app_list',
608 '../ui/aura/aura.gyp:aura', 607 '../ui/aura/aura.gyp:aura',
609 '../ui/aura/aura.gyp:aura_test_support', 608 '../ui/aura/aura.gyp:aura_test_support',
610 '../ui/app_list/app_list.gyp:app_list',
611 '../ui/compositor/compositor.gyp:compositor', 609 '../ui/compositor/compositor.gyp:compositor',
612 '../ui/keyboard/keyboard.gyp:keyboard', 610 '../ui/keyboard/keyboard.gyp:keyboard',
613 '../ui/message_center/message_center.gyp:message_center', 611 '../ui/message_center/message_center.gyp:message_center',
614 '../ui/ui.gyp:ui', 612 '../ui/ui.gyp:ui',
615 '../ui/ui.gyp:ui_resources', 613 '../ui/ui.gyp:ui_resources',
616 '../ui/ui.gyp:ui_test_support', 614 '../ui/ui.gyp:ui_test_support',
617 '../ui/views/views.gyp:views', 615 '../ui/views/views.gyp:views',
616 '../ui/views/views.gyp:views_examples_with_content_lib',
618 '../ui/views/views.gyp:views_test_support', 617 '../ui/views/views.gyp:views_test_support',
619 '../ui/views/views.gyp:views_examples_with_content_lib',
620 '../ui/views/views.gyp:views_with_content_test_support', 618 '../ui/views/views.gyp:views_with_content_test_support',
621 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', 619 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
620 '../url/url.gyp:url_lib',
621 'ash_strings.gyp:ash_strings',
622 'ash', 622 'ash',
623 'ash_resources', 623 'ash_resources',
624 'ash_test_support', 624 'ash_test_support',
625 ], 625 ],
626 'sources': [ 626 'sources': [
627 '../ui/compositor/test/layer_animator_test_controller.cc', 627 '../ui/compositor/test/layer_animator_test_controller.cc',
628 '../ui/compositor/test/layer_animator_test_controller.h', 628 '../ui/compositor/test/layer_animator_test_controller.h',
629 '../ui/views/test/test_views_delegate.cc', 629 '../ui/views/test/test_views_delegate.cc',
630 '../ui/views/test/test_views_delegate.h', 630 '../ui/views/test/test_views_delegate.h',
631 'accelerators/accelerator_controller_unittest.cc', 631 'accelerators/accelerator_controller_unittest.cc',
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 'shell/cocoa/app-Info.plist', 854 'shell/cocoa/app-Info.plist',
855 ], 855 ],
856 'xcode_settings': { 856 'xcode_settings': {
857 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 857 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
858 }, 858 },
859 }], 859 }],
860 ], 860 ],
861 }, 861 },
862 ], 862 ],
863 } 863 }
OLDNEW
« no previous file with comments | « DEPS ('k') | build/temp_gyp/googleurl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698