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

Unified Diff: chrome/chrome_dll.gypi

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove nacl_win64 and dummy hacks Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_dll.gypi
===================================================================
--- chrome/chrome_dll.gypi (revision 100565)
+++ chrome/chrome_dll.gypi (working copy)
@@ -659,82 +659,37 @@
'target_name': 'chrome_dll_nacl_win64',
'type': 'shared_library',
'product_name': 'nacl64',
- 'variables': {
- 'chrome_dll_target': 1,
- },
'include_dirs': [
'..',
],
'dependencies': [
- '<@(nacl_win64_dependencies)',
'chrome_version_resources',
+ 'common_constants_win64',
+ 'installer_util_nacl_win64',
'nacl_win64',
'../base/base.gyp:base_i18n_nacl_win64',
+ '../base/base.gyp:base_static_win64',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
+ '../ipc/ipc.gyp:ipc_win64',
],
'defines': [
'<@(nacl_win64_defines)',
- # Required to build gl_switches.cc as part of this binary.
- 'GL_IMPLEMENTATION'
],
'sources': [
- 'app/chrome_command_ids.h',
- 'app/chrome_dll_resource.h',
- 'app/chrome_main.cc',
- # Parsing is needed for the UserDataDir policy which is read much
- # earlier than the initialization of the policy/pref system.
- 'browser/policy/policy_path_parser_win.cc',
- 'browser/renderer_host/render_process_host_dummy.cc',
- 'common/googleurl_dummy.cc',
-
- '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_dll_version.rc',
-
- # TODO: It would be nice to have these pulled in
- # automatically from direct_dependent_settings in
- # their various targets (net.gyp:net_resources, etc.),
- # but that causes errors in other targets when
- # resulting .res files get referenced multiple times.
- '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
-
- # TODO(sgk): left-over from pre-gyp build, figure out
- # if we still need them and/or how to update to gyp.
- #'app/check_dependents.bat',
- #'app/chrome.dll.deps',
-
- # Stub entry points for process types that are not supported
- # by NaCl Win64 executable
- 'app/dummy_main_functions.cc',
-
- # TODO(bradnelson): once automatic generation of 64 bit targets on
- # Windows is ready, take this out and add a dependency on
- # content_common.gypi and common.gypi in nacl_win64_dependencies
- # and get rid of the common_constants.gypi which was added as a hack
- # to avoid making common compile on 64 bit on Windows.
- '../chrome/common/chrome_content_client.cc',
- '../chrome/common/chrome_content_plugin_client.cc',
- '../content/app/content_main.cc',
- '../content/common/child_process.cc',
- '../content/common/child_thread.cc',
- '../content/common/content_client.cc',
- '../content/common/content_constants.cc',
- '../content/common/content_counters.cc',
- '../content/common/content_message_generator.cc',
- '../content/common/content_paths.cc',
+ 'nacl/nacl_main_win_64.cc',
+ '../content/app/startup_helper_win.cc',
'../content/common/content_switches.cc',
- '../content/common/debug_flags.cc',
+ '../content/common/debug_flags.cc', # Needed for sandbox_policy.cc
'../content/common/hi_res_timer_manager_win.cc',
- '../content/common/notification_details.cc',
- '../content/common/notification_service.cc',
- '../content/common/notification_source.cc',
'../content/common/sandbox_policy.cc',
'../content/common/sandbox_init_wrapper_win.cc',
- '../content/common/url_constants.cc',
- '../ui/gfx/gl/gl_switches.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_dll_version.rc',
],
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\nacl64_dll.lib',
'ProgramDatabaseFile': '$(OutDir)\\nacl64_dll.pdb',
+ 'SubSystem': '2',
},
},
'configurations': {
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698