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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 2800014: Reland r50057. This is exactly the same except with two lines cherrypicked from (Closed) Base URL: http://src.chromium.org/git/chromium.git
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
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/common/chrome_paths.h » ('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',
21 'platform_locale_settings', 20 'platform_locale_settings',
22 'profile_import', 21 'profile_import',
23 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 22 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
24 'syncapi', 23 'syncapi',
25 'theme_resources', 24 'theme_resources',
26 'userfeedback_proto', 25 'userfeedback_proto',
27 '../app/app.gyp:app_resources', 26 '../app/app.gyp:app_resources',
28 '../app/app.gyp:app_strings', 27 '../app/app.gyp:app_strings',
29 '../media/media.gyp:media', 28 '../media/media.gyp:media',
30 '../printing/printing.gyp:printing', 29 '../printing/printing.gyp:printing',
(...skipping 2642 matching lines...) Expand 10 before | Expand all | Expand 10 after
2673 'browser/worker_host/worker_document_set.h', 2672 'browser/worker_host/worker_document_set.h',
2674 'browser/worker_host/worker_process_host.cc', 2673 'browser/worker_host/worker_process_host.cc',
2675 'browser/worker_host/worker_process_host.h', 2674 'browser/worker_host/worker_process_host.h',
2676 'browser/worker_host/worker_service.cc', 2675 'browser/worker_host/worker_service.cc',
2677 'browser/worker_host/worker_service.h', 2676 'browser/worker_host/worker_service.h',
2678 'browser/wrench_menu_model.cc', 2677 'browser/wrench_menu_model.cc',
2679 'browser/wrench_menu_model.h', 2678 'browser/wrench_menu_model.h',
2680 'browser/zygote_host_linux.cc', 2679 'browser/zygote_host_linux.cc',
2681 'browser/zygote_main_linux.cc', 2680 'browser/zygote_main_linux.cc',
2682 2681
2683 # This file is generated by GRIT. 2682 # These files are generated by GRIT.
2684 '<(grit_out_dir)/grit/theme_resources_map.cc', 2683 '<(grit_out_dir)/grit/theme_resources_map.cc',
2684 '<(grit_out_dir)/grit/net_internals_resources_map.cc',
2685 ], 2685 ],
2686 'conditions': [ 2686 'conditions': [
2687 ['javascript_engine=="v8"', { 2687 ['javascript_engine=="v8"', {
2688 'defines': [ 2688 'defines': [
2689 'CHROME_V8', 2689 'CHROME_V8',
2690 ], 2690 ],
2691 }], 2691 }],
2692 ['chromeos==0', { 2692 ['chromeos==0', {
2693 'sources/': [ 2693 'sources/': [
2694 ['exclude', '^browser/chromeos'], 2694 ['exclude', '^browser/chromeos'],
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
3541 'browser/resources/chat_manager/js/chatbridgeeventtypes.js', 3541 'browser/resources/chat_manager/js/chatbridgeeventtypes.js',
3542 'browser/resources/chat_manager/js/chatbridgehook.js', 3542 'browser/resources/chat_manager/js/chatbridgehook.js',
3543 'browser/resources/chat_manager/js/gmailbridgehook.js', 3543 'browser/resources/chat_manager/js/gmailbridgehook.js',
3544 ] 3544 ]
3545 }, 3545 },
3546 ] 3546 ]
3547 }] 3547 }]
3548 ], 3548 ],
3549 }, 3549 },
3550 { 3550 {
3551 'target_name': 'net_internals_resources',
3552 'type': 'none',
3553 # TODO(eroman): Once the msvs port supports it, change this to recursively
3554 # copy the entire directory instead of listing the files.
3555 # http://code.google.com/p/gyp/issues/detail?id=143.
3556 'copies': [
3557 {
3558 'destination': '<(PRODUCT_DIR)/resources/net_internals',
3559 'files': [
3560 'browser/resources/net_internals/dataview.js',
3561 'browser/resources/net_internals/detailsview.js',
3562 'browser/resources/net_internals/dnsview.js',
3563 'browser/resources/net_internals/httpcacheview.js',
3564 'browser/resources/net_internals/index.html',
3565 'browser/resources/net_internals/loggrouper.js',
3566 'browser/resources/net_internals/logviewpainter.js',
3567 'browser/resources/net_internals/main.css',
3568 'browser/resources/net_internals/main.js',
3569 'browser/resources/net_internals/proxyview.js',
3570 'browser/resources/net_internals/requestsview.js',
3571 'browser/resources/net_internals/resizableverticalsplitview.js',
3572 'browser/resources/net_internals/sourceentry.js',
3573 'browser/resources/net_internals/tabswitcherview.js',
3574 'browser/resources/net_internals/testview.js',
3575 'browser/resources/net_internals/timelineviewpainter.js',
3576 'browser/resources/net_internals/topmidbottomview.js',
3577 'browser/resources/net_internals/util.js',
3578 'browser/resources/net_internals/view.js',
3579 ]
3580 },
3581 ]
3582 },
3583 {
3584 # Protobuf compiler / generate rule for feedback 3551 # Protobuf compiler / generate rule for feedback
3585 'target_name': 'userfeedback_proto', 3552 'target_name': 'userfeedback_proto',
3586 'type': 'none', 3553 'type': 'none',
3587 'sources': [ 3554 'sources': [
3588 'browser/userfeedback/proto/annotations.proto', 3555 'browser/userfeedback/proto/annotations.proto',
3589 'browser/userfeedback/proto/common.proto', 3556 'browser/userfeedback/proto/common.proto',
3590 'browser/userfeedback/proto/config.proto', 3557 'browser/userfeedback/proto/config.proto',
3591 'browser/userfeedback/proto/dom.proto', 3558 'browser/userfeedback/proto/dom.proto',
3592 'browser/userfeedback/proto/extension.proto', 3559 'browser/userfeedback/proto/extension.proto',
3593 'browser/userfeedback/proto/math.proto', 3560 'browser/userfeedback/proto/math.proto',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
3633 ], 3600 ],
3634 }, 3601 },
3635 ], 3602 ],
3636 } 3603 }
3637 3604
3638 # Local Variables: 3605 # Local Variables:
3639 # tab-width:2 3606 # tab-width:2
3640 # indent-tabs-mode:nil 3607 # indent-tabs-mode:nil
3641 # End: 3608 # End:
3642 # vim: set expandtab tabstop=2 shiftwidth=2: 3609 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/common/chrome_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698