0

Snapshotting progress.

Got app and unit_tests linking with gyp under windows.
Still missing pieces (things don't run).

Review URL: http://codereview.chromium.org/39319

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11302 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
bradnelson@google.com
2009-03-09 22:56:42 +00:00
parent 3daae9f20e
commit 19acec5887
7 changed files with 534 additions and 108 deletions
chrome
chrome.gyp
installer
sandbox
third_party/zlib
webkit
default_plugin
tools
test_shell
webkit.gyp

@ -335,12 +335,10 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'third_party/hunspell/hunspell.gyp:hunspell',
'../webkit/webkit.gyp:glue',
],
'include_dirs': [
'..',
# TODO(bradnelson): this should really be from a dependency on
# webkit_resources.
'<(SHARED_INTERMEDIATE_DIR)/webkit',
'<(INTERMEDIATE_DIR)',
],
'sources': [
@ -358,6 +356,9 @@
'browser/autocomplete/autocomplete_accessibility.h',
'browser/autocomplete/autocomplete_edit.cc',
'browser/autocomplete/autocomplete_edit.h',
'browser/autocomplete/autocomplete_edit_view.h',
'browser/autocomplete/autocomplete_edit_view_win.cc',
'browser/autocomplete/autocomplete_edit_view_win.h',
'browser/autocomplete/autocomplete_popup_model.cc',
'browser/autocomplete/autocomplete_popup_model.h',
'browser/autocomplete/autocomplete_popup_view.h',
@ -515,11 +516,15 @@
'browser/debugger/debugger_wrapper.h',
'browser/debugger/dev_tools_window.cc',
'browser/debugger/dev_tools_window.h',
'browser/debugger/dev_tools_view.cc',
'browser/debugger/dev_tools_view.h',
'browser/dock_info.cc',
'browser/dock_info.h',
'browser/dom_operation_notification_details.h',
'browser/dom_ui/chrome_url_data_manager.cc',
'browser/dom_ui/chrome_url_data_manager.h',
'browser/dom_ui/dev_tools_ui.cc',
'browser/dom_ui/dev_tools_ui.h',
'browser/dom_ui/dom_ui.cc',
'browser/dom_ui/dom_ui.h',
'browser/dom_ui/dom_ui_contents.cc',
@ -923,6 +928,8 @@
'browser/tab_contents/provisional_load_details.h',
'browser/tab_contents/render_view_context_menu.cc',
'browser/tab_contents/render_view_context_menu.h',
'browser/tab_contents/render_view_context_menu_win.cc',
'browser/tab_contents/render_view_context_menu_win.h',
'browser/tab_contents/render_view_host_manager.cc',
'browser/tab_contents/render_view_host_manager.h',
'browser/tab_contents/repost_form_warning.h',
@ -1026,6 +1033,8 @@
'browser/views/frame/glass_browser_frame_view.h',
'browser/views/frame/opaque_browser_frame_view.cc',
'browser/views/frame/opaque_browser_frame_view.h',
'browser/views/fullscreen_exit_bubble.cc',
'browser/views/fullscreen_exit_bubble.h',
'browser/views/go_button.cc',
'browser/views/go_button.h',
'browser/views/html_dialog_view.cc',
@ -1165,6 +1174,7 @@
'../net/net.gyp:net_resources',
'../google_update/google_update.gyp:google_update',
'installer/util/util.gyp:installer_util',
'../printing/printing.gyp:printing',
],
'sources': [
# Using built-in rule in vstudio for midl.
@ -1220,6 +1230,10 @@
'browser/debugger/debugger_window.cc',
'browser/debugger/dev_tools_window.cc',
'browser/debugger/dev_tools_window.h',
'browser/debugger/dev_tools_view.cc',
'browser/debugger/dev_tools_view.h',
'browser/dom_ui/dev_tools_ui.cc',
'browser/dom_ui/dev_tools_ui.h',
'browser/dom_ui/html_dialog_contents.cc',
'browser/importer/ie_importer.cc',
'browser/tab_contents/render_view_context_menu_controller.cc',
@ -1338,6 +1352,8 @@
'renderer/webmediaplayer_delegate_impl.h',
'renderer/webplugin_delegate_proxy.cc',
'renderer/webplugin_delegate_proxy.h',
'renderer/webworker_proxy.cc',
'renderer/webworker_proxy.h',
],
'link_settings': {
'mac_bundle_resources': [
@ -1358,6 +1374,8 @@
'renderer/chrome_plugin_host.cc',
'renderer/plugin_channel_host.cc',
'renderer/webplugin_delegate_proxy.cc',
'renderer/webworker_proxy.cc',
'renderer/webworker_proxy.h',
],
},],
],
@ -1445,6 +1463,8 @@
'dependencies': [
'views',
'../breakpad/breakpad.gyp:breakpad_handler',
'../sandbox/sandbox.gyp:sandbox',
'worker',
],
},{ # 'OS!="win"
'variables': {
@ -1574,8 +1594,38 @@
'renderer/mock_render_process.h',
'renderer/mock_render_thread.cc',
'renderer/mock_render_thread.h',
'test/automation/automation_proxy.cc',
'test/automation/automation_proxy.h',
'test/automation/browser_proxy.cc',
'test/automation/browser_proxy.h',
'test/automation/tab_proxy.cc',
'test/automation/tab_proxy.h',
'test/automation/window_proxy.cc',
'test/automation/window_proxy.h',
'test/testing_profile.cc',
'test/testing_profile.h',
'test/ui/ui_test.cc',
'test/ui/ui_test.h',
],
'conditions': [
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
],
},{ # 'OS!="win"
'sources!': [
'test/automation/automation_proxy.cc',
'test/automation/automation_proxy.h',
'test/automation/browser_proxy.cc',
'test/automation/browser_proxy.h',
'test/automation/tab_proxy.cc',
'test/automation/tab_proxy.h',
'test/automation/window_proxy.cc',
'test/automation/window_proxy.h',
'test/ui/ui_test.cc',
'test/ui/ui_test.h',
],
}],
],
},
{
@ -1615,20 +1665,10 @@
],
'sources': [
'test/ui/run_all_unittests.cc',
'test/ui/ui_test.cc',
'test/ui/ui_test.h',
'test/ui/ui_test_suite.cc',
'test/ui/ui_test_suite.h',
'test/automation/automation_proxy.cc',
'test/automation/automation_proxy.h',
'test/automation/automation_handle_tracker.cc',
'test/automation/automation_handle_tracker.h',
'test/automation/browser_proxy.cc',
'test/automation/browser_proxy.h',
'test/automation/tab_proxy.cc',
'test/automation/tab_proxy.h',
'test/automation/window_proxy.cc',
'test/automation/window_proxy.h',
],
'conditions': [
['OS=="mac"', {
@ -1689,12 +1729,17 @@
'browser/autocomplete/history_contents_provider_unittest.cc',
'browser/autocomplete/history_url_provider_unittest.cc',
'browser/autocomplete/keyword_provider_unittest.cc',
'browser/back_forward_menu_model_unittest.cc',
'browser/bookmarks/bookmark_drag_data_unittest.cc',
'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
'browser/bookmarks/bookmark_html_writer_unittest.cc',
'browser/bookmarks/bookmark_model_unittest.cc',
'browser/bookmarks/bookmark_table_model_unittest.cc',
'browser/bookmarks/bookmark_utils_unittest.cc',
'browser/browser_commands_unittest.cc',
'browser/cache_manager_host_unittest.cc',
'browser/chrome_thread_unittest.cc',
'browser/command_updater_unittest.cc',
'browser/download/download_manager_unittest.cc',
'browser/download/download_request_manager_unittest.cc',
'browser/download/save_package_unittest.cc',
@ -1702,6 +1747,7 @@
'browser/extensions/extension_ui_unittest.cc',
'browser/extensions/extensions_service_unittest.cc',
'browser/extensions/user_script_master_unittest.cc',
'browser/google_url_tracker_unittest.cc',
'browser/history/expire_history_backend_unittest.cc',
'browser/history/history_backend_unittest.cc',
'browser/history/history_querying_unittest.cc',
@ -1718,8 +1764,11 @@
'browser/history/visit_tracker_unittest.cc',
'browser/importer/firefox_importer_unittest.cc',
'browser/importer/importer_unittest.cc',
'browser/login_prompt_unittest.cc',
'browser/metrics/metrics_log_unittest.cc',
'browser/metrics/metrics_response_unittest.cc',
'browser/navigation_controller_unittest.cc',
'browser/navigation_entry_unittest.cc',
'browser/net/dns_host_info_unittest.cc',
'browser/net/dns_master_unittest.cc',
'browser/net/resolve_proxy_msg_helper_unittest.cc',
@ -1733,6 +1782,7 @@
'browser/printing/page_setup_unittest.cc',
'browser/printing/print_job_unittest.cc',
'browser/printing/win_printing_context_unittest.cc',
'browser/profile_manager_unittest.cc',
'browser/renderer_host/audio_renderer_host_unittest.cc',
'browser/renderer_host/render_view_host_unittest.cc',
'browser/renderer_host/render_widget_host_unittest.cc',
@ -1750,44 +1800,34 @@
'browser/search_engines/template_url_prepopulate_data_unittest.cc',
'browser/search_engines/template_url_unittest.cc',
'browser/sessions/session_backend_unittest.cc',
'browser/sessions/session_service_unittest.cc',
'browser/sessions/session_service_test_helper.cc',
'browser/sessions/session_service_test_helper.h',
'browser/sessions/session_service_unittest.cc',
'browser/sessions/tab_restore_service_unittest.cc',
'browser/site_instance_unittest.cc',
'browser/spellcheck_unittest.cc',
'browser/tab_contents/web_contents_unittest.cc',
'browser/tabs/tab_strip_model_unittest.cc',
'browser/views/bookmark_editor_view_unittest.cc',
'browser/views/find_bar_win_unittest.cc',
'browser/views/keyword_editor_view_unittest.cc',
'browser/webdata/web_database_unittest.cc',
'browser/back_forward_menu_model_unittest.cc',
'browser/browser_commands_unittest.cc',
'browser/cache_manager_host_unittest.cc',
'browser/chrome_thread_unittest.cc',
'browser/command_updater_unittest.cc',
'browser/google_url_tracker_unittest.cc',
'browser/login_prompt_unittest.cc',
'browser/navigation_controller_unittest.cc',
'browser/navigation_entry_unittest.cc',
'browser/profile_manager_unittest.cc',
'browser/site_instance_unittest.cc',
'browser/spellcheck_unittest.cc',
'browser/visitedlink_unittest.cc',
'browser/webdata/web_database_unittest.cc',
'browser/window_sizer_unittest.cc',
'common/animation_unittest.cc',
'common/bzip2_unittest.cc',
'common/chrome_plugin_unittest.cc',
'common/extensions/url_pattern_unittest.cc',
'common/extensions/user_script_unittest.cc',
'common/file_descriptor_set_unittest.cc',
'common/gfx/chrome_font_unittest.cc',
'common/gfx/emf_unittest.cc',
'common/gfx/icon_util_unittest.cc',
'common/gfx/text_elider_unittest.cc',
'common/net/url_util_unittest.cc',
'common/animation_unittest.cc',
'common/bzip2_unittest.cc',
'common/chrome_plugin_unittest.cc',
'common/file_descriptor_set_unittest.cc',
'common/json_value_serializer_unittest.cc',
'common/l10n_util_unittest.cc',
'common/mru_cache_unittest.cc',
'common/net/url_util_unittest.cc',
'common/notification_service_unittest.cc',
'common/os_exchange_data_unittest.cc',
'common/pref_member_unittest.cc',
@ -1806,13 +1846,19 @@
'renderer/render_view_unittest.cc',
'renderer/render_widget_unittest.cc',
'renderer/renderer_main_unittest.cc',
'test/v8_unit_test.cc',
'test/v8_unit_test.h',
'test/browser_with_test_window_test.cc',
'test/browser_with_test_window_test.h',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
'test/test_tab_contents.cc',
'test/test_tab_contents.h',
'test/ui_test_utils.cc',
'test/ui_test_utils.h',
'test/unit/run_all_unittests.cc',
'test/v8_unit_test.cc',
'test/v8_unit_test.h',
],
'conditions': [
['OS=="win"', {
@ -1842,11 +1888,13 @@
'browser/autocomplete/history_contents_provider_unittest.cc',
'browser/autocomplete/history_url_provider_unittest.cc',
'browser/autocomplete/keyword_provider_unittest.cc',
'browser/back_forward_menu_model_unittest.cc',
'browser/bookmarks/bookmark_drag_data_unittest.cc',
'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
'browser/bookmarks/bookmark_html_writer_unittest.cc',
'browser/bookmarks/bookmark_table_model_unittest.cc',
'browser/bookmarks/bookmark_utils_unittest.cc',
'browser/browser_commands_unittest.cc',
'browser/download/download_manager_unittest.cc',
'browser/download/download_request_manager_unittest.cc',
'browser/extensions/user_script_master_unittest.cc',
@ -1854,6 +1902,8 @@
'browser/history/thumbnail_database_unittest.cc',
'browser/importer/firefox_importer_unittest.cc',
'browser/importer/importer_unittest.cc',
'browser/login_prompt_unittest.cc',
'browser/navigation_controller_unittest.cc',
'browser/net/resolve_proxy_msg_helper_unittest.cc',
'browser/net/url_fetcher_unittest.cc',
'browser/net/url_fixer_upper_unittest.cc',
@ -1864,37 +1914,39 @@
'browser/printing/print_job_unittest.cc',
'browser/rlz/rlz_unittest.cc',
'browser/sessions/session_backend_unittest.cc',
'browser/sessions/session_service_unittest.cc',
'browser/sessions/session_service_test_helper.cc',
'browser/sessions/session_service_test_helper.h',
'browser/sessions/session_service_unittest.cc',
'browser/sessions/tab_restore_service_unittest.cc',
'browser/tab_contents/web_contents_unittest.cc',
'browser/tabs/tab_strip_model_unittest.cc',
'browser/views/bookmark_editor_view_unittest.cc',
'browser/views/find_bar_win_unittest.cc',
'browser/views/keyword_editor_view_unittest.cc',
'browser/back_forward_menu_model_unittest.cc',
'browser/browser_commands_unittest.cc',
'browser/login_prompt_unittest.cc',
'browser/navigation_controller_unittest.cc',
'browser/visitedlink_unittest.cc',
'browser/webdata/web_database_unittest.cc',
'browser/window_sizer_unittest.cc',
'common/chrome_plugin_unittest.cc',
'common/gfx/emf_unittest.cc',
'common/gfx/icon_util_unittest.cc',
'common/net/url_util_unittest.cc',
'common/chrome_plugin_unittest.cc',
'common/os_exchange_data_unittest.cc',
'common/pref_service_unittest.cc',
'common/time_format_unittest.cc',
'renderer/render_view_unittest.cc',
'renderer/render_widget_unittest.cc',
'test/v8_unit_test.cc',
'test/v8_unit_test.h',
'test/browser_with_test_window_test.cc',
'test/browser_with_test_window_test.h',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
'test/test_tab_contents.cc',
'test/test_tab_contents.h',
'test/ui_test_utils.cc',
'test/ui_test_utils.h',
'test/v8_unit_test.cc',
'test/v8_unit_test.h',
],
}],
],
@ -1940,13 +1992,7 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'third_party/hunspell/hunspell.gyp:hunspell',
],
'include_dirs': [
'..',
# TODO(bradnelson): this should really be from a dependency on
# webkit_resources.
'<(SHARED_INTERMEDIATE_DIR)/webkit',
'<(INTERMEDIATE_DIR)',
'../webkit/webkit.gyp:glue',
],
'sources': [
# All .cc, .h, .m, and .mm files under browser except for tests and
@ -2111,12 +2157,9 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'third_party/hunspell/hunspell.gyp:hunspell',
'../webkit/webkit.gyp:glue',
],
'include_dirs': [
'..',
# TODO(bradnelson): this should really be from a dependency on
# webkit_resources.
'<(SHARED_INTERMEDIATE_DIR)/webkit',
'<(INTERMEDIATE_DIR)',
],
'sources': [
@ -2159,6 +2202,37 @@
},],
],
},
{
'target_name': 'worker',
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../webkit/webkit.gyp:webkit',
],
'sources': [
'tools/build/win/precompiled.cc',
'tools/build/win/precompiled.h',
'worker/webworkerclient_proxy.cc',
'worker/webworkerclient_proxy.h',
'worker/worker_main.cc',
'worker/worker_process.cc',
'worker/worker_process.h',
'worker/worker_thread.cc',
'worker/worker_thread.h',
'worker/worker_webkitclient_impl.cc',
'worker/worker_webkitclient_impl.h',
],
'include_dirs': [
'..',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tools/build/win/precompiled.h',
'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
},
},
},
]}, # 'targets'
], # OS=="mac"
], # 'conditions'

@ -65,6 +65,8 @@
'lzma_util.h',
'master_preferences.cc',
'master_preferences.h',
'move_tree_work_item.cc',
'move_tree_work_item.h',
'set_reg_value_work_item.cc',
'set_reg_value_work_item.h',
'shell_util.cc',

316
sandbox/sandbox.gyp Normal file

@ -0,0 +1,316 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'includes': [
'../build/common.gypi',
],
'conditions': [
[ 'OS=="win"', {
'targets': [
{
'target_name': 'sandbox',
'type': 'static_library',
'dependencies': [
'../testing/gtest.gyp:gtest',
'../base/base.gyp:base',
],
'sources': [
'src/acl.cc',
'src/acl.h',
'src/dep.cc',
'src/dep.h',
'src/job.cc',
'src/job.h',
'src/restricted_token.cc',
'src/restricted_token.h',
'src/restricted_token_utils.cc',
'src/restricted_token_utils.h',
'src/security_level.h',
'src/sid.cc',
'src/sid.h',
'src/eat_resolver.cc',
'src/eat_resolver.h',
'src/interception.cc',
'src/interception.h',
'src/interception_agent.cc',
'src/interception_agent.h',
'src/interception_internal.h',
'src/pe_image.cc',
'src/pe_image.h',
'src/resolver.cc',
'src/resolver.h',
'src/service_resolver.cc',
'src/service_resolver.h',
'src/sidestep_resolver.cc',
'src/sidestep_resolver.h',
'src/target_interceptions.cc',
'src/target_interceptions.h',
'src/Wow64.cc',
'src/Wow64.h',
'src/sidestep\ia32_modrm_map.cpp',
'src/sidestep\ia32_opcode_map.cpp',
'src/sidestep\mini_disassembler.cpp',
'src/sidestep\mini_disassembler.h',
'src/sidestep\mini_disassembler_types.h',
'src/sidestep\preamble_patcher.h',
'src/sidestep\preamble_patcher_with_stub.cpp',
'src/nt_internals.h',
'src/policy_target.cc',
'src/policy_target.h',
'src/sandbox_nt_types.h',
'src/sandbox_nt_util.cc',
'src/sandbox_nt_util.h',
'src/filesystem_dispatcher.cc',
'src/filesystem_dispatcher.h',
'src/filesystem_interception.cc',
'src/filesystem_interception.h',
'src/filesystem_policy.cc',
'src/filesystem_policy.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/policy_params.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/sync_dispatcher.cc',
'src/sync_dispatcher.h',
'src/sync_interception.cc',
'src/sync_interception.h',
'src/sync_policy.cc',
'src/sync_policy.h',
'src/crosscall_client.h',
'src/crosscall_params.h',
'src/crosscall_server.cc',
'src/crosscall_server.h',
'src/ipc_tags.h',
'src/sharedmem_ipc_client.cc',
'src/sharedmem_ipc_client.h',
'src/sharedmem_ipc_server.cc',
'src/sharedmem_ipc_server.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/sandbox_policy_base.cc',
'src/sandbox_policy_base.h',
'src/broker_services.cc',
'src/broker_services.h',
'src/internal_types.h',
'src/policy_broker.cc',
'src/policy_broker.h',
'src/sandbox.cc',
'src/sandbox.h',
'src/sandbox_factory.h',
'src/sandbox_policy.h',
'src/sandbox_types.h',
'src/sandbox_utils.cc',
'src/sandbox_utils.h',
'src/shared_handles.cc',
'src/shared_handles.h',
'src/target_process.cc',
'src/target_process.h',
'src/target_services.cc',
'src/target_services.h',
'src/win2k_threadpool.cc',
'src/win2k_threadpool.h',
'src/win_utils.cc',
'src/win_utils.h',
# Precompiled headers.
'src/stdafx.cc',
'src/stdafx.h',
],
'include_dirs': [
'..',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'src/stdafx.h',
'msvs_precompiled_source': 'src/stdafx.cc',
},
},
'direct_dependent_settings': {
'include_dirs': [
'src',
'..',
],
},
},
{
'target_name': 'sbox_integration_tests',
'type': 'executable',
'dependencies': [
'sandbox',
'../testing/gtest.gyp:gtest',
],
'sources': [
'tests/common/controller.cc',
'tests/common/controller.h',
'tests/integration_tests/integration_tests.cc',
'src/dep_test.cc',
'src/file_policy_test.cc',
'tests/integration_tests/integration_tests_test.cc',
'src/integrity_level_test.cc',
'src/ipc_ping_test.cc',
'src/named_pipe_policy_test.cc',
'src/policy_target_test.cc',
'src/process_policy_test.cc',
'src/registry_policy_test.cc',
'src/sync_policy_test.cc',
'src/unload_dll_test.cc',
# Precompiled headers.
'tests/integration_tests/stdafx.cc',
'tests/integration_tests/stdafx.h',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tests/integration_tests/stdafx.h',
'msvs_precompiled_source': 'tests/integration_tests/stdafx.cc',
},
},
},
{
'target_name': 'sbox_validation_tests',
'type': 'executable',
'dependencies': [
'sandbox',
'../testing/gtest.gyp:gtest',
],
'sources': [
'tests/common/controller.cc',
'tests/common/controller.h',
'tests/validation_tests/unit_tests.cc',
'tests/validation_tests/commands.cc',
'tests/validation_tests/commands.h',
'tests/validation_tests/suite.cc',
# Precompiled headers.
'tests/validation_tests/stdafx.cc',
'tests/validation_tests/stdafx.h',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tests/validation_tests/stdafx.h',
'msvs_precompiled_source': 'tests/validation_tests/stdafx.cc',
},
},
},
{
'target_name': 'sbox_unit_tests',
'type': 'executable',
'dependencies': [
'sandbox',
'../testing/gtest.gyp:gtest',
],
'sources': [
'tests/unit_tests/unit_tests.cc',
'src/interception_unittest.cc',
'src/pe_image_unittest.cc',
'src/service_resolver_unittest.cc',
'src/restricted_token_unittest.cc',
'src/job_unittest.cc',
'src/sid_unittest.cc',
'src/policy_engine_unittest.cc',
'src/policy_low_level_unittest.cc',
'src/policy_opcodes_unittest.cc',
'src/ipc_unittest.cc',
'src/threadpool_unittest.cc',
# Precompiled headers.
'tests/unit_tests/stdafx.cc',
'tests/unit_tests/stdafx.h',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tests/unit_tests/stdafx.h',
'msvs_precompiled_source': 'tests/unit_tests/stdafx.cc',
},
},
},
{
'target_name': 'sandbox_poc',
'type': 'executable',
'dependencies': [
'sandbox',
'pocdll',
],
'sources': [
'sandbox_poc/main_ui_window.cc',
'sandbox_poc/main_ui_window.h',
'sandbox_poc/resource.h',
'sandbox_poc/sandbox.cc',
'sandbox_poc/sandbox.h',
'sandbox_poc/sandbox.ico',
'sandbox_poc/sandbox.rc',
# Precompiled headers.
'sandbox_poc/stdafx.cc',
'sandbox_poc/stdafx.h',
],
'link_settings': {
'libraries': [
'-lcomctl32.lib',
],
},
'configurations': {
'Debug': {
'msvs_precompiled_header': 'sandbox_poc/stdafx.h',
'msvs_precompiled_source': 'sandbox_poc/stdafx.cc',
},
},
},
{
'target_name': 'pocdll',
'type': 'shared_library',
'sources': [
'sandbox_poc/pocdll/exports.h',
'sandbox_poc/pocdll/fs.cc',
'sandbox_poc/pocdll/handles.cc',
'sandbox_poc/pocdll/invasive.cc',
'sandbox_poc/pocdll/network.cc',
'sandbox_poc/pocdll/pocdll.cc',
'sandbox_poc/pocdll/processes_and_threads.cc',
'sandbox_poc/pocdll/registry.cc',
'sandbox_poc/pocdll/spyware.cc',
'sandbox_poc/pocdll/utils.h',
# Precompiled headers.
'sandbox_poc/pocdll/stdafx.cc',
'sandbox_poc/pocdll/stdafx.h',
],
'defines': [
'POCDLL_EXPORTS',
],
'include_dirs': [
'..',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'sandbox_poc/pocdll/stdafx.h',
'msvs_precompiled_source': 'sandbox_poc/pocdll/stdafx.cc',
},
},
},
],
}],
],
}

@ -13,7 +13,7 @@
'sources': [
'contrib/minizip/ioapi.c',
'contrib/minizip/ioapi.h',
'contrib/minizip/iowin32.c'
'contrib/minizip/iowin32.c',
'contrib/minizip/iowin32.h',
'contrib/minizip/unzip.c',
'contrib/minizip/unzip.h',

@ -7,41 +7,48 @@
'../../build/common.gypi',
],
'targets': [
{
'target_name': 'default_plugin',
'type': 'static_library',
'dependencies': [
'../../third_party/libxml/libxml.gyp:libxml',
'../../third_party/icu38/icu38.gyp:icui18n',
'../../third_party/icu38/icu38.gyp:icuuc',
'../../third_party/npapi/npapi.gyp:npapi',
'../../net/net.gyp:net_resources',
],
'conditions': [
['OS=="win"', {
'targets': [
{
'target_name': 'default_plugin',
'type': 'static_library',
'dependencies': [
'../../third_party/libxml/libxml.gyp:libxml',
'../../third_party/icu38/icu38.gyp:icui18n',
'../../third_party/icu38/icu38.gyp:icuuc',
'../../third_party/npapi/npapi.gyp:npapi',
'../webkit.gyp:webkit_resources',
'../../net/net.gyp:net_resources',
],
'include_dirs': [
'../..',
# TODO(bradnelson): this should fall out of the dependencies.
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],
'sources': [
'activex_installer.cc',
'activex_installer.h',
'default_plugin.cc',
'default_plugin_resources.h',
'default_plugin_shared.h',
'install_dialog.cc',
'install_dialog.h',
'plugin_database_handler.cc',
'plugin_database_handler.h',
'plugin_impl_win.cc',
'plugin_impl_win.h',
'plugin_install_job_monitor.cc',
'plugin_install_job_monitor.h',
'plugin_main.cc',
'plugin_main.h',
],
'link_settings': {
'libraries': ['-lUrlmon.lib'],
},
},
],
'include_dirs': [
'../..',
# TODO(bradnelson): this should fall out of the dependencies.
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],
'sources': [
'activex_installer.cc',
'activex_installer.h',
'default_plugin.cc',
'default_plugin_resources.h',
'default_plugin_shared.h',
'install_dialog.cc',
'install_dialog.h',
'plugin_database_handler.cc',
'plugin_database_handler.h',
'plugin_impl_win.cc',
'plugin_impl_win.h',
'plugin_install_job_monitor.cc',
'plugin_install_job_monitor.h',
'plugin_main.cc',
'plugin_main.h',
],
'link_settings': {
'libraries': ['-lUrlmon.lib'],
},
},
},],
],
}

@ -115,6 +115,7 @@
},
'dependencies': [
'../../../breakpad/breakpad.gyp:breakpad_handler',
'../../default_plugin/default_plugin.gyp:default_plugin',
],
}, { # else: OS!=win
'sources/': [

@ -4113,26 +4113,13 @@
],
},
{
'target_name': 'glue',
'type': 'static_library',
'target_name': 'webkit_resources',
'type': 'none',
'dependencies': [
'webcore',
'webkit',
'../net/net.gyp:net',
],
'actions': [
{
'action_name': 'webkit_version',
'inputs': [
'build/webkit_version.py',
'../third_party/WebKit/WebCore/Configurations/Version.xcconfig',
],
'outputs': [
'<(INTERMEDIATE_DIR)/webkit_version.h',
],
'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
},
],
'rules': [
{
'rule_name': 'grit',
@ -4146,6 +4133,39 @@
'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'],
},
],
'sources': [
# grit rule
'glue/webkit_resources.grd',
'glue/webkit_strings.grd',
],
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],
},
},
{
'target_name': 'glue',
'type': 'static_library',
'dependencies': [
'webcore',
'webkit',
'../net/net.gyp:net',
'webkit_resources',
],
'actions': [
{
'action_name': 'webkit_version',
'inputs': [
'build/webkit_version.py',
'../third_party/WebKit/WebCore/Configurations/Version.xcconfig',
],
'outputs': [
'<(INTERMEDIATE_DIR)/webkit_version.h',
],
'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
},
],
'include_dirs': [
'<(INTERMEDIATE_DIR)',
],
@ -4153,10 +4173,6 @@
# webkit_version rule
'../third_party/WebKit/WebCore/Configurations/Version.xcconfig',
# grit rule
'glue/webkit_resources.grd',
'glue/webkit_strings.grd',
# This list contains all .h, .cc, and .mm files in glue except for
# those in the test subdirectory and those with unittest in in their
# names.
@ -4342,6 +4358,11 @@
'glue/webwidget_delegate.h',
'glue/webwidget_impl.cc',
'glue/webwidget_impl.h',
'glue/webworker.h',
'glue/webworker_impl.cc',
'glue/webworker_impl.h',
'glue/webworkerclient_impl.cc',
'glue/webworkerclient_impl.h',
'glue/window_open_disposition.h',
'pending/AccessibleBase.cpp',
'pending/AccessibleBase.h',
@ -4381,6 +4402,11 @@
'glue/plugins/webplugin_delegate_impl.cc',
'glue/glue_accessibility.cc',
'glue/webdropdata.cc',
'glue/webworker.h',
'glue/webworker_impl.cc',
'glue/webworker_impl.h',
'glue/webworkerclient_impl.cc',
'glue/webworkerclient_impl.h',
'pending/AccessibleBase.cpp',
'pending/AccessibleDocument.cpp',
],