sandbox/sandbox.gyp - Issue 543058: Prepare the sandbox for integration with NaCl broker for 64-bit Windows. The ...

Unified Diff: sandbox/sandbox.gyp

Issue 543058: Prepare the sandbox for integration with NaCl broker for 64-bit Windows. The ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 11 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: sandbox/sandbox.gyp

===================================================================

--- sandbox/sandbox.gyp (revision 36231)

+++ sandbox/sandbox.gyp (working copy)

@@ -3,6 +3,101 @@

# found in the LICENSE file.

{

+ 'target_defaults': {

+ 'variables': {

+ 'sandbox_windows_target': 0,

+ },

+ 'target_conditions': [

+ ['sandbox_windows_target==1', {

+ # Files that are shared between the 32-bit and the 64-bit versions

+ # of the Windows sandbox library.

+ 'sources': [

+ 'src/acl.cc',

+ 'src/acl.h',

+ 'src/broker_services.cc',

+ 'src/broker_services.h',

+ 'src/crosscall_client.h',

+ 'src/crosscall_params.h',

+ 'src/crosscall_server.cc',

+ 'src/crosscall_server.h',

+ 'src/dep.cc',

+ 'src/dep.h',

+ 'src/eat_resolver.cc',

+ 'src/eat_resolver.h',

+ 'src/filesystem_dispatcher.cc',

+ 'src/filesystem_dispatcher.h',

+ 'src/filesystem_policy.cc',

+ 'src/filesystem_policy.h',

+ 'src/internal_types.h',

+ 'src/ipc_tags.h',

+ 'src/job.cc',

+ 'src/job.h',

+ 'src/named_pipe_dispatcher.cc',

+ 'src/named_pipe_dispatcher.h',

+ 'src/named_pipe_policy.cc',

+ 'src/named_pipe_policy.h',

+ 'src/nt_internals.h',

+ 'src/policy_broker.cc',

+ 'src/policy_broker.h',

+ 'src/policy_engine_opcodes.cc',

+ 'src/policy_engine_opcodes.h',

+ 'src/policy_engine_params.h',

+ 'src/policy_engine_processor.cc',

+ 'src/policy_engine_processor.h',

+ 'src/policy_low_level.cc',

+ 'src/policy_low_level.h',

+ 'src/policy_params.h',

+ 'src/policy_target.cc',

+ 'src/policy_target.h',

+ 'src/process_thread_dispatcher.cc',

+ 'src/process_thread_dispatcher.h',

+ 'src/process_thread_policy.cc',

+ 'src/process_thread_policy.h',

+ 'src/registry_dispatcher.cc',

+ 'src/registry_dispatcher.h',

+ 'src/registry_policy.cc',

+ 'src/registry_policy.h',

+ 'src/resolver.cc',

+ 'src/resolver.h',

+ 'src/restricted_token_utils.cc',

+ 'src/restricted_token_utils.h',

+ 'src/restricted_token.cc',

+ 'src/restricted_token.h',

+ 'src/sandbox_factory.h',

+ 'src/sandbox_nt_types.h',

+ 'src/sandbox_nt_util.cc',

+ 'src/sandbox_nt_util.h',

+ 'src/sandbox_policy_base.cc',

+ 'src/sandbox_policy_base.h',

+ 'src/sandbox_policy.h',

+ 'src/sandbox_types.h',

+ 'src/sandbox_utils.cc',

+ 'src/sandbox_utils.h',

+ 'src/sandbox.cc',

+ 'src/sandbox.h',

+ 'src/security_level.h',

+ 'src/shared_handles.cc',

+ 'src/shared_handles.h',

+ 'src/sid.cc',

+ 'src/sid.h',

+ 'src/sync_dispatcher.cc',

+ 'src/sync_dispatcher.h',

+ 'src/sync_policy.cc',

+ 'src/sync_policy.h',

+ 'src/target_process.cc',

+ 'src/target_process.h',

+ 'src/target_services.cc',

+ 'src/target_services.h',

+ 'src/win_utils.cc',

+ 'src/win_utils.h',

+ 'src/win2k_threadpool.cc',

+ 'src/win2k_threadpool.h',

+ 'src/window.cc',

+ 'src/window.h',

+ ],

+ }],

+ ],

+ },

'conditions': [

[ 'OS=="linux" and selinux==0', {

'targets': [

@@ -88,99 +183,35 @@

{

'target_name': 'sandbox',

'type': '<(library)',

+ 'variables': {

+ 'sandbox_windows_target': 1,

+ },

'dependencies': [

'../testing/gtest.gyp:gtest',

'../base/base.gyp:base',

'msvs_guid': '881F6A97-D539-4C48-B401-DF04385B2343',

'sources': [

- 'src/acl.cc',

- 'src/acl.h',

- 'src/broker_services.cc',

- 'src/broker_services.h',

- 'src/crosscall_client.h',

- 'src/crosscall_params.h',

- 'src/crosscall_server.cc',

- 'src/crosscall_server.h',

- 'src/dep.cc',

- 'src/dep.h',

- 'src/eat_resolver.cc',

- 'src/eat_resolver.h',

- 'src/filesystem_dispatcher.cc',

- 'src/filesystem_dispatcher.h',

+ # Files that are used by the 32-bit version of Windows sandbox only.

'src/filesystem_interception.cc',

'src/filesystem_interception.h',

- 'src/filesystem_policy.cc',

- 'src/filesystem_policy.h',

'src/interception_agent.cc',

'src/interception_agent.h',

'src/interception_internal.h',

'src/interception.cc',

'src/interception.h',

- 'src/internal_types.h',

- 'src/ipc_tags.h',

- 'src/job.cc',

- 'src/job.h',

- 'src/named_pipe_dispatcher.cc',

- 'src/named_pipe_dispatcher.h',

'src/named_pipe_interception.cc',

'src/named_pipe_interception.h',

- 'src/named_pipe_policy.cc',

- 'src/named_pipe_policy.h',

- 'src/nt_internals.h',

- 'src/policy_broker.cc',

- 'src/policy_broker.h',

- 'src/policy_engine_opcodes.cc',

- 'src/policy_engine_opcodes.h',

- 'src/policy_engine_params.h',

- 'src/policy_engine_processor.cc',

- 'src/policy_engine_processor.h',

- 'src/policy_low_level.cc',

- 'src/policy_low_level.h',

- 'src/policy_params.h',

- 'src/policy_target.cc',

- 'src/policy_target.h',

- 'src/process_thread_dispatcher.cc',

- 'src/process_thread_dispatcher.h',

'src/process_thread_interception.cc',

'src/process_thread_interception.h',

- 'src/process_thread_policy.cc',

- 'src/process_thread_policy.h',

- 'src/registry_dispatcher.cc',

- 'src/registry_dispatcher.h',

'src/registry_interception.cc',

'src/registry_interception.h',

- 'src/registry_policy.cc',

- 'src/registry_policy.h',

- 'src/resolver.cc',

- 'src/resolver.h',

- 'src/restricted_token_utils.cc',

- 'src/restricted_token_utils.h',

- 'src/restricted_token.cc',

- 'src/restricted_token.h',

- 'src/sandbox_factory.h',

- 'src/sandbox_nt_types.h',

- 'src/sandbox_nt_util.cc',

- 'src/sandbox_nt_util.h',

- 'src/sandbox_policy_base.cc',

- 'src/sandbox_policy_base.h',

- 'src/sandbox_policy.h',

- 'src/sandbox_types.h',

- 'src/sandbox_utils.cc',

- 'src/sandbox_utils.h',

- 'src/sandbox.cc',

- 'src/sandbox.h',

- 'src/security_level.h',

'src/service_resolver.cc',

'src/service_resolver.h',

- 'src/shared_handles.cc',

- 'src/shared_handles.h',

'src/sharedmem_ipc_client.cc',

'src/sharedmem_ipc_client.h',

'src/sharedmem_ipc_server.cc',

'src/sharedmem_ipc_server.h',

- 'src/sid.cc',

- 'src/sid.h',

'src/sidestep_resolver.cc',

'src/sidestep_resolver.h',

'src/sidestep\ia32_modrm_map.cpp',

@@ -190,24 +221,10 @@

'src/sidestep\mini_disassembler.h',

'src/sidestep\preamble_patcher_with_stub.cpp',

'src/sidestep\preamble_patcher.h',

- 'src/sync_dispatcher.cc',

- 'src/sync_dispatcher.h',

'src/sync_interception.cc',

'src/sync_interception.h',

- 'src/sync_policy.cc',

- 'src/sync_policy.h',

'src/target_interceptions.cc',

'src/target_interceptions.h',

- 'src/target_process.cc',

- 'src/target_process.h',

- 'src/target_services.cc',

- 'src/target_services.h',

- 'src/win_utils.cc',

- 'src/win_utils.h',

- 'src/win2k_threadpool.cc',

- 'src/win2k_threadpool.h',

- 'src/window.cc',

- 'src/window.h',

'src/Wow64.cc',

'src/Wow64.h',

@@ -231,6 +248,35 @@

{

+ 'target_name': 'sandbox_win64',

+ 'type': '<(library)',

+ 'variables': {

+ 'sandbox_windows_target': 1,

+ },

+ 'dependencies': [

+ '../testing/gtest.gyp:gtest',

+ '../base/base.gyp:base_nacl_win64',

+ ],

+ 'configurations': {

+ 'Common_Base': {

+ 'msvs_target_platform': 'x64',

+ },

+ 'msvs_guid': 'BE3468E6-B314-4310-B449-6FC0C52EE155',

+ 'include_dirs': [

+ '..',

+ ],

+ 'direct_dependent_settings': {

+ 'include_dirs': [

+ 'src',

+ '..',

+ ],

+ },

+ 'defines': [

+ '<@(nacl_win64_defines)',

+ ]

+ },

+ {

'target_name': 'sbox_integration_tests',

'type': 'executable',

'dependencies': [

« no previous file with comments | « no previous file | sandbox/src/sandbox.cc » ('j') | no next file with comments »