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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 12521002: Start and stop crash reporting outside of the loader lock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert r70898 Created 7 years, 9 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
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 8
9 # Keep the archive builder happy. 9 # Keep the archive builder happy.
10 'chrome_personalization%': 1, 10 'chrome_personalization%': 1,
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 ], 890 ],
891 'defines': [ 891 'defines': [
892 '_WINDLL', 892 '_WINDLL',
893 ], 893 ],
894 'sources': [ 894 'sources': [
895 'chrome_frame_elevation.rgs', 895 'chrome_frame_elevation.rgs',
896 'chrome_frame_reporting.cc', 896 'chrome_frame_reporting.cc',
897 'chrome_frame_reporting.h', 897 'chrome_frame_reporting.h',
898 'chrome_tab.cc', 898 'chrome_tab.cc',
899 'chrome_tab.def', 899 'chrome_tab.def',
900 'scoped_initialization_manager.h',
900 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 901 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
901 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/npchrome_frame_dll_version.rc', 902 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/npchrome_frame_dll_version.rc',
902 # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can 903 # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
903 # figure out something more gyp-ish. 904 # figure out something more gyp-ish.
904 'resources/tlb_resource.rc', 905 'resources/tlb_resource.rc',
905 'chrome_tab.rgs', 906 'chrome_tab.rgs',
906 'resource.h', 907 'resource.h',
907 ], 908 ],
908 'conditions': [ 909 'conditions': [
909 ['OS=="win"', { 910 ['OS=="win"', {
910 # NOTE(slightlyoff): 911 # NOTE(slightlyoff):
911 # this is a fix for the include dirs length limit on the resource 912 # this is a fix for the include dirs length limit on the resource
912 # compiler, tickled by the xul_include_dirs variable 913 # compiler, tickled by the xul_include_dirs variable
913 'resource_include_dirs': [ 914 'resource_include_dirs': [
914 '<(INTERMEDIATE_DIR)' 915 '<(INTERMEDIATE_DIR)'
915 ], 916 ],
916 'sources': [ 917 'sources': [
917 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc', 918 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc',
918 ], 919 ],
919 'dependencies': [ 920 'dependencies': [
920 '../breakpad/breakpad.gyp:breakpad_handler_dll', 921 '../breakpad/breakpad.gyp:breakpad_handler',
921 '../chrome/chrome.gyp:automation', 922 '../chrome/chrome.gyp:automation',
922 # Installer 923 # Installer
923 '../chrome/chrome.gyp:installer_util', 924 '../chrome/chrome.gyp:installer_util',
924 '../google_update/google_update.gyp:google_update', 925 '../google_update/google_update.gyp:google_update',
925 # Make the archive build happy. 926 # Make the archive build happy.
926 '../sync/sync.gyp:sync', 927 '../sync/sync.gyp:sync',
927 # Crash Reporting 928 # Crash Reporting
928 'crash_reporting/crash_reporting.gyp:crash_report', 929 'crash_reporting/crash_reporting.gyp:crash_report',
929 ], 930 ],
930 'link_settings': { 931 'link_settings': {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 # Use outputs of this action as inputs for the main target build. 1080 # Use outputs of this action as inputs for the main target build.
1080 # Seems as a misnomer but makes this happy on Linux (scons). 1081 # Seems as a misnomer but makes this happy on Linux (scons).
1081 'process_outputs_as_sources': 1, 1082 'process_outputs_as_sources': 1,
1082 }, 1083 },
1083 ], 1084 ],
1084 }, 1085 },
1085 ], 1086 ],
1086 }, ], # 'coverage!=0' 1087 }, ], # 'coverage!=0'
1087 ], # 'conditions' 1088 ], # 'conditions'
1088 } 1089 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698