diff options
| -rw-r--r-- | chrome/chrome_exe.gypi | 112 | ||||
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 8 |
2 files changed, 71 insertions, 49 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 4fbb0d4..3da48fb 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -518,57 +518,71 @@ '../base/base.gyp:base', ], }, - { - 'target_name': 'chrome_nacl_win64', - 'type': 'executable', - 'product_name': 'nacl64', - 'sources': [ - 'app/breakpad_win.cc', - 'app/hard_error_handler_win.cc', - 'nacl/nacl_exe_win_64.cc', - '../content/app/startup_helper_win.cc', - '../content/common/debug_flags.cc', # Needed for sandbox_policy.cc - '../content/common/sandbox_init_win.cc', - '../content/common/sandbox_policy.cc', - '../content/public/common/content_switches.cc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', - ], - 'dependencies': [ - 'app/policy/cloud_policy_codegen.gyp:policy_win64', - 'chrome_version_resources', - 'common_constants_win64', - 'installer_util_nacl_win64', - 'nacl_win64', - '../breakpad/breakpad.gyp:breakpad_handler_win64', - '../breakpad/breakpad.gyp:breakpad_sender_win64', - '../base/base.gyp:base_i18n_nacl_win64', - '../base/base.gyp:base_nacl_win64', - '../base/base.gyp:base_static_win64', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', - '../crypto/crypto.gyp:crypto_nacl_win64', - '../ipc/ipc.gyp:ipc_win64', - '../sandbox/sandbox.gyp:sandbox_win64', - ], - 'defines': [ - '<@(nacl_win64_defines)', - 'COMPILE_CONTENT_STATICALLY', - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', - 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', - 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS + ], + 'conditions': [ + ['disable_nacl!=1', { + 'targets': [ + { + 'target_name': 'chrome_nacl_win64', + 'type': 'executable', + 'product_name': 'nacl64', + 'sources': [ + 'app/breakpad_win.cc', + 'app/hard_error_handler_win.cc', + 'nacl/nacl_exe_win_64.cc', + '../content/app/startup_helper_win.cc', + '../content/common/debug_flags.cc', # Needed for sandbox_policy.cc + '../content/common/sandbox_init_win.cc', + '../content/common/sandbox_policy.cc', + '../content/public/common/content_switches.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', + ], + 'dependencies': [ + 'app/policy/cloud_policy_codegen.gyp:policy_win64', + 'chrome_version_resources', + 'common_constants_win64', + 'installer_util_nacl_win64', + 'nacl_win64', + '../breakpad/breakpad.gyp:breakpad_handler_win64', + '../breakpad/breakpad.gyp:breakpad_sender_win64', + '../base/base.gyp:base_i18n_nacl_win64', + '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_static_win64', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', + '../crypto/crypto.gyp:crypto_nacl_win64', + '../ipc/ipc.gyp:ipc_win64', + '../sandbox/sandbox.gyp:sandbox_win64', + ], + 'defines': [ + '<@(nacl_win64_defines)', + 'COMPILE_CONTENT_STATICALLY', + ], + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', + 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS + }, + }, + 'configurations': { + 'Common_Base': { + 'msvs_target_platform': 'x64', + }, + }, }, - }, - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', + ], + }, { # else (disable_nacl==1) + 'targets': [ + { + 'target_name': 'chrome_nacl_win64', + 'type': 'none', + 'sources': [], }, - }, - }, + ], + }], ], }], ], diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 94f4457..0748ceb 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -223,6 +223,14 @@ 'component_build_flag': '', }, }], + ['disable_nacl==1', { + 'inputs!': [ + '<(PRODUCT_DIR)/nacl64.exe', + '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + ], + }], ], 'inputs': [ '<(create_installer_archive_py_path)', |