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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 2799022: Speculatively revert 50374 (miniinstaller breakage) - Load netinternals resou... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | « chrome/chrome.gyp ('k') | chrome/chrome_dll.gypi » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
11 'dependencies': [ 11 'dependencies': [
12 'common', 12 'common',
13 'common_net', 13 'common_net',
14 'chrome_extra_resources', 14 'chrome_extra_resources',
15 'chrome_resources', 15 'chrome_resources',
16 'chrome_strings', 16 'chrome_strings',
17 'chrome_version_info', 17 'chrome_version_info',
18 'component_extensions', 18 'component_extensions',
19 'domui_shared_resources', 19 'domui_shared_resources',
20 'net_internals_resources',
20 'platform_locale_settings', 21 'platform_locale_settings',
21 'profile_import', 22 'profile_import',
22 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 23 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
23 'syncapi', 24 'syncapi',
24 'theme_resources', 25 'theme_resources',
25 'userfeedback_proto', 26 'userfeedback_proto',
26 '../app/app.gyp:app_resources', 27 '../app/app.gyp:app_resources',
27 '../app/app.gyp:app_strings', 28 '../app/app.gyp:app_strings',
28 '../media/media.gyp:media', 29 '../media/media.gyp:media',
29 '../printing/printing.gyp:printing', 30 '../printing/printing.gyp:printing',
(...skipping 2648 matching lines...) Expand 10 before | Expand all | Expand 10 after
2678 'browser/worker_host/worker_document_set.h', 2679 'browser/worker_host/worker_document_set.h',
2679 'browser/worker_host/worker_process_host.cc', 2680 'browser/worker_host/worker_process_host.cc',
2680 'browser/worker_host/worker_process_host.h', 2681 'browser/worker_host/worker_process_host.h',
2681 'browser/worker_host/worker_service.cc', 2682 'browser/worker_host/worker_service.cc',
2682 'browser/worker_host/worker_service.h', 2683 'browser/worker_host/worker_service.h',
2683 'browser/wrench_menu_model.cc', 2684 'browser/wrench_menu_model.cc',
2684 'browser/wrench_menu_model.h', 2685 'browser/wrench_menu_model.h',
2685 'browser/zygote_host_linux.cc', 2686 'browser/zygote_host_linux.cc',
2686 'browser/zygote_main_linux.cc', 2687 'browser/zygote_main_linux.cc',
2687 2688
2688 # These files are generated by GRIT. 2689 # This file is generated by GRIT.
2689 '<(grit_out_dir)/grit/theme_resources_map.cc', 2690 '<(grit_out_dir)/grit/theme_resources_map.cc',
2690 '<(grit_out_dir)/grit/net_internals_resources_map.cc',
2691 ], 2691 ],
2692 'conditions': [ 2692 'conditions': [
2693 ['javascript_engine=="v8"', { 2693 ['javascript_engine=="v8"', {
2694 'defines': [ 2694 'defines': [
2695 'CHROME_V8', 2695 'CHROME_V8',
2696 ], 2696 ],
2697 }], 2697 }],
2698 ['chromeos==0', { 2698 ['chromeos==0', {
2699 'sources/': [ 2699 'sources/': [
2700 ['exclude', '^browser/chromeos'], 2700 ['exclude', '^browser/chromeos'],
(...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
3548 'browser/resources/chat_manager/js/chatbridgeeventtypes.js', 3548 'browser/resources/chat_manager/js/chatbridgeeventtypes.js',
3549 'browser/resources/chat_manager/js/chatbridgehook.js', 3549 'browser/resources/chat_manager/js/chatbridgehook.js',
3550 'browser/resources/chat_manager/js/gmailbridgehook.js', 3550 'browser/resources/chat_manager/js/gmailbridgehook.js',
3551 ] 3551 ]
3552 }, 3552 },
3553 ] 3553 ]
3554 }] 3554 }]
3555 ], 3555 ],
3556 }, 3556 },
3557 { 3557 {
3558 'target_name': 'net_internals_resources',
3559 'type': 'none',
3560 # TODO(eroman): Once the msvs port supports it, change this to recursively
3561 # copy the entire directory instead of listing the files.
3562 # http://code.google.com/p/gyp/issues/detail?id=143.
3563 'copies': [
3564 {
3565 'destination': '<(PRODUCT_DIR)/resources/net_internals',
3566 'files': [
3567 'browser/resources/net_internals/dataview.js',
3568 'browser/resources/net_internals/detailsview.js',
3569 'browser/resources/net_internals/dnsview.js',
3570 'browser/resources/net_internals/httpcacheview.js',
3571 'browser/resources/net_internals/index.html',
3572 'browser/resources/net_internals/loggrouper.js',
3573 'browser/resources/net_internals/logviewpainter.js',
3574 'browser/resources/net_internals/main.css',
3575 'browser/resources/net_internals/main.js',
3576 'browser/resources/net_internals/proxyview.js',
3577 'browser/resources/net_internals/requestsview.js',
3578 'browser/resources/net_internals/resizableverticalsplitview.js',
3579 'browser/resources/net_internals/sourceentry.js',
3580 'browser/resources/net_internals/tabswitcherview.js',
3581 'browser/resources/net_internals/testview.js',
3582 'browser/resources/net_internals/timelineviewpainter.js',
3583 'browser/resources/net_internals/topmidbottomview.js',
3584 'browser/resources/net_internals/util.js',
3585 'browser/resources/net_internals/view.js',
3586 ]
3587 },
3588 ]
3589 },
3590 {
3558 # Protobuf compiler / generate rule for feedback 3591 # Protobuf compiler / generate rule for feedback
3559 'target_name': 'userfeedback_proto', 3592 'target_name': 'userfeedback_proto',
3560 'type': 'none', 3593 'type': 'none',
3561 'sources': [ 3594 'sources': [
3562 'browser/userfeedback/proto/annotations.proto', 3595 'browser/userfeedback/proto/annotations.proto',
3563 'browser/userfeedback/proto/common.proto', 3596 'browser/userfeedback/proto/common.proto',
3564 'browser/userfeedback/proto/config.proto', 3597 'browser/userfeedback/proto/config.proto',
3565 'browser/userfeedback/proto/dom.proto', 3598 'browser/userfeedback/proto/dom.proto',
3566 'browser/userfeedback/proto/extension.proto', 3599 'browser/userfeedback/proto/extension.proto',
3567 'browser/userfeedback/proto/math.proto', 3600 'browser/userfeedback/proto/math.proto',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
3607 ], 3640 ],
3608 }, 3641 },
3609 ], 3642 ],
3610 } 3643 }
3611 3644
3612 # Local Variables: 3645 # Local Variables:
3613 # tab-width:2 3646 # tab-width:2
3614 # indent-tabs-mode:nil 3647 # indent-tabs-mode:nil
3615 # End: 3648 # End:
3616 # vim: set expandtab tabstop=2 shiftwidth=2: 3649 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698