diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_exe.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 2 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 159 |
3 files changed, 9 insertions, 154 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 1b3ef306..78047eb 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -573,7 +573,6 @@ 'app/policy/cloud_policy_codegen.gyp:policy_win64', 'chrome_version_resources', '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', @@ -582,6 +581,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', '../components/components.gyp:breakpad_win64', '../chrome/common_constants.gyp:common_constants_win64', + '../components/nacl.gyp:nacl_win64', '../crypto/crypto.gyp:crypto_nacl_win64', '../ipc/ipc.gyp:ipc_win64', '../sandbox/sandbox.gyp:sandbox_win64', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 1e56650..d7f0353 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -337,7 +337,7 @@ 'conditions': [ ['disable_nacl!=1', { 'dependencies': [ - 'nacl', + '../components/nacl.gyp:nacl', ], }], ['enable_plugins==1', { diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 09cfbaf..ab7a03c 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -3,142 +3,13 @@ # found in the LICENSE file. { - 'include': [ - '../native_client/build/untrusted.gypi', - ], - 'target_defaults': { - 'variables': { - 'nacl_target': 0, - }, - 'target_conditions': [ - # This part is shared between the targets defined below. Only files and - # settings relevant for building the Win64 target should be added here. - ['nacl_target==1', { - 'include_dirs': [ - '<(INTERMEDIATE_DIR)', - ], - 'defines': [ - '<@(nacl_defines)', - ], - 'sources': [ - # .cc, .h, and .mm files under nacl that are used on all - # platforms, including both 32-bit and 64-bit Windows. - # Test files are also not included. - '../components/nacl/loader/nacl_ipc_adapter.cc', - '../components/nacl/loader/nacl_ipc_adapter.h', - '../components/nacl/loader/nacl_main.cc', - '../components/nacl/loader/nacl_main_platform_delegate.h', - '../components/nacl/loader/nacl_main_platform_delegate_linux.cc', - '../components/nacl/loader/nacl_main_platform_delegate_mac.mm', - '../components/nacl/loader/nacl_main_platform_delegate_win.cc', - '../components/nacl/loader/nacl_listener.cc', - '../components/nacl/loader/nacl_listener.h', - '../components/nacl/loader/nacl_validation_db.h', - '../components/nacl/loader/nacl_validation_query.cc', - '../components/nacl/loader/nacl_validation_query.h', - ], - # TODO(gregoryd): consider switching NaCl to use Chrome OS defines - 'conditions': [ - ['OS=="win"', { - 'defines': [ - '__STDC_LIMIT_MACROS=1', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/wtl/include', - ], - },], - ['OS=="linux"', { - 'defines': [ - '__STDC_LIMIT_MACROS=1', - ], - 'sources': [ - '../components/nacl/common/nacl_paths.cc', - '../components/nacl/common/nacl_paths.h', - '../components/nacl/zygote/nacl_fork_delegate_linux.cc', - '../components/nacl/zygote/nacl_fork_delegate_linux.h', - ], - },], - ], - }], - ], - }, 'conditions': [ ['disable_nacl!=1', { - 'targets': [ - { - 'target_name': 'nacl', - 'type': 'static_library', - 'variables': { - 'nacl_target': 1, - }, - 'dependencies': [ - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome', - '../ppapi/ppapi_internal.gyp:ppapi_shared', - '../ppapi/ppapi_internal.gyp:ppapi_ipc', - '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome', - ], - 'conditions': [ - ['disable_nacl_untrusted==0', { - 'dependencies': [ - '../ppapi/native_client/native_client.gyp:nacl_irt', - '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim', - '../ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp:pnacl_support_extension', - ], - }], - ], - 'direct_dependent_settings': { - 'defines': [ - '<@(nacl_defines)', - ], - }, - }, - ], 'conditions': [ - ['OS=="win" and target_arch=="ia32"', { - 'targets': [ - { - 'target_name': 'nacl_win64', - 'type': 'static_library', - 'variables': { - 'nacl_target': 1, - }, - 'dependencies': [ - '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64', - '../ppapi/ppapi_internal.gyp:ppapi_shared_win64', - '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', - '../components/nacl_common.gyp:nacl_common_win64', - ], - 'export_dependent_settings': [ - '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', - ], - 'sources': [ - '../components/nacl/broker/nacl_broker_listener.cc', - '../components/nacl/broker/nacl_broker_listener.h', - '../components/nacl/common/nacl_debug_exception_handler_win.cc', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - '<@(nacl_win64_defines)', - 'COMPILE_CONTENT_STATICALLY', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - 'direct_dependent_settings': { - 'defines': [ - '<@(nacl_defines)', - ], - }, - }, - ], - }], ['OS=="linux"', { + 'includes': [ + '../components/nacl/nacl_defines.gypi', + ], 'targets': [ { 'target_name': 'nacl_helper', @@ -147,11 +18,14 @@ '..', ], 'dependencies': [ + '../components/nacl.gyp:nacl', '../components/nacl_common.gyp:nacl_common', '../crypto/crypto.gyp:crypto', '../sandbox/sandbox.gyp:libc_urandom_override', '../sandbox/sandbox.gyp:sandbox', - 'nacl', + ], + 'defines': [ + '<@(nacl_defines)', ], 'sources': [ 'nacl/nacl_helper_linux.cc', @@ -191,25 +65,6 @@ ], }], ], - }, { # else (disable_nacl==1) - 'targets': [ - { - 'target_name': 'nacl', - 'type': 'none', - 'sources': [], - }, - ], - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'nacl_win64', - 'type': 'none', - 'sources': [], - }, - ], - }], - ], }], ], } |