Skip to content

GitLab

T
tangled
Commit 4cfa7b62 authored by sgk@google.com's avatar sgk@google.com
Browse files
Options

Add .dll (and a .exe) files to the gyp build: 

* activex_test_control.dll
* browser_tests.dll
* browser_tests.exe
* memory_watcher.dll
* rlz.dll
* security_tests.dll
* test_chrome_plugin.dll
* themes/default.dll
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/113915

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17023 0039d316-1c4b-4281-b951-d872f2087c98
parent 280671f2
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 3 deletions
build/all.gyp
View file @ 4cfa7b62
...@@ -63,12 +63,14 @@ ...@@ -63,12 +63,14 @@
'dependencies': [ 'dependencies': [
'../breakpad/breakpad.gyp:*', '../breakpad/breakpad.gyp:*',
'../courgette/courgette.gyp:*', '../courgette/courgette.gyp:*',
'../gears/gears.gyp:*',
'../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*', '../sandbox/sandbox.gyp:*',
'../third_party/bsdiff/bsdiff.gyp:*', '../third_party/bsdiff/bsdiff.gyp:*',
'../third_party/bspatch/bspatch.gyp:*', '../third_party/bspatch/bspatch.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
'../webkit/activex_shim/activex_shim.gyp:*', '../webkit/activex_shim/activex_shim.gyp:*',
'../webkit/activex_shim_dll/activex_shim_dll.gyp:*', '../webkit/activex_shim_dll/activex_shim_dll.gyp:*',
'../gears/gears.gyp:*',
], ],
}, { }, {
'dependencies': [ 'dependencies': [
......
chrome/chrome.gyp
View file @ 4cfa7b62
...@@ -3450,11 +3450,14 @@ ...@@ -3450,11 +3450,14 @@
'../build/temp_gyp/googleurl.gyp:*', '../build/temp_gyp/googleurl.gyp:*',
'../sandbox/sandbox.gyp:*', '../breakpad/breakpad.gyp:*',
'../courgette/courgette.gyp:*', '../courgette/courgette.gyp:*',
'../gears/gears.gyp:*',
'../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
'../webkit/activex_shim/activex_shim.gyp:*', '../webkit/activex_shim/activex_shim.gyp:*',
'../webkit/activex_shim_dll/activex_shim_dll.gyp:*', '../webkit/activex_shim_dll/activex_shim_dll.gyp:*',
'../breakpad/breakpad.gyp:*',
], ],
}, },
{ {
...@@ -3562,6 +3565,32 @@ ...@@ -3562,6 +3565,32 @@
}, },
}, },
}, },
{
'target_name': 'activex_test_control',
'type': 'shared_library',
'include_dirs': [
'..',
'<(INTERMEDIATE_DIR)',
],
'link_settings': {
'libraries': [
'-lcomsuppw.lib',
],
},
'sources': [
'test/activex_test_control/activex_test_control.cc',
'test/activex_test_control/activex_test_control.def',
'test/activex_test_control/activex_test_control.idl',
'test/activex_test_control/activex_test_control.rc',
'test/activex_test_control/activex_test_control.rgs',
'test/activex_test_control/chrome_test_control.bmp',
'test/activex_test_control/chrome_test_control.cc',
'test/activex_test_control/chrome_test_control.h',
'test/activex_test_control/chrome_test_control.rgs',
'test/activex_test_control/chrome_test_control_cp.h',
'test/activex_test_control/resource.h',
],
},
{ {
'target_name': 'automated_ui_tests', 'target_name': 'automated_ui_tests',
'type': 'executable', 'type': 'executable',
...@@ -3595,6 +3624,76 @@ ...@@ -3595,6 +3624,76 @@
}, },
}, },
}, },
{
'target_name': 'browser_tests',
'type': 'executable',
'dependencies': [
'installer/installer.gyp:installer_util',
],
'include_dirs': [
'..',
],
'sources': [
'test/browser/browser_tests_launcher.cc',
],
},
{
'target_name': 'browser_tests_dll',
'type': 'shared_library',
'product_name': 'browser_tests',
'dependencies': [
'browser',
'chrome_resources',
'renderer',
'installer/installer.gyp:installer_util_strings',
'../base/base.gyp:base',
'../base/base.gyp:base_gfx',
'../net/net.gyp:net',
'../net/net.gyp:net_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../webkit/webkit.gyp:glue',
'../webkit/webkit.gyp:webkit_resources',
],
'include_dirs': [
'..',
'third_party/wtl/include',
],
'sources': [
'../webkit/glue/resources/aliasb.cur',
'../webkit/glue/resources/cell.cur',
'../webkit/glue/resources/col_resize.cur',
'../webkit/glue/resources/copy.cur',
'../webkit/glue/resources/row_resize.cur',
'../webkit/glue/resources/vertical_text.cur',
'../webkit/glue/resources/zoom_in.cur',
'../webkit/glue/resources/zoom_out.cur',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_dll_version.rc.version',
'browser/child_process_security_policy_browser_test.cc',
'browser/renderer_host/web_cache_manager_browser_test.cc',
'browser/ssl/ssl_browser_tests.cc',
'browser/task_manager_browsertest.cc',
'browser/views/find_bar_win_browsertest.cc',
'test/browser/run_all_unittests.cc',
'test/data/resource.h',
'test/data/resource.rc',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
'test/ui_test_utils.cc',
'test/ui_test_utils.h',
'test/unit/chrome_test_suite.h',
'tools/build/win/precompiled_wtl.cc',
'tools/build/win/precompiled_wtl.h',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
},
},
},
{ {
'target_name': 'convert_dict', 'target_name': 'convert_dict',
'type': 'executable', 'type': 'executable',
...@@ -3786,6 +3885,21 @@ ...@@ -3786,6 +3885,21 @@
'test/reliability/run_all_unittests.cc', 'test/reliability/run_all_unittests.cc',
], ],
}, },
{
'target_name': 'security_tests',
'type': 'shared_library',
'include_dirs': [
'..',
],
'sources': [
'test/injection_test_dll.h',
'test/security_tests/ipc_security_tests.cc',
'test/security_tests/ipc_security_tests.h',
'test/security_tests/security_tests.cc',
'../sandbox/tests/validation_tests/commands.cc',
'../sandbox/tests/validation_tests/commands.h',
],
},
{ {
'target_name': 'selenium_tests', 'target_name': 'selenium_tests',
'type': 'executable', 'type': 'executable',
...@@ -3830,6 +3944,56 @@ ...@@ -3830,6 +3944,56 @@
'test/tab_switching/tab_switching_test.cc', 'test/tab_switching/tab_switching_test.cc',
], ],
}, },
{
'target_name': 'test_chrome_plugin',
'type': 'shared_library',
'dependencies': [
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
],
'include_dirs': [
'..',
],
'link_settings': {
'libraries': [
'-lwinmm.lib',
],
},
'sources': [
'test/chrome_plugin/test_chrome_plugin.cc',
'test/chrome_plugin/test_chrome_plugin.def',
'test/chrome_plugin/test_chrome_plugin.h',
],
},
{
'target_name': 'theme_dll',
'type': 'shared_library',
'product_name': 'default',
'dependencies': [
'theme_resources',
'../app/app.gyp:app_resources',
],
'sources': [
'<(grit_out_dir)/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc',
],
'msvs_settings': {
'VCLinkerTool': {
'BaseAddress': '0x3CE00000',
'OutputFile': '<(PRODUCT_DIR)/themes/default.dll',
'ResourceOnlyDLL': 'true',
},
},
'configurations': {
'Debug': {
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '1', # /INCREMENTAL:NO
},
},
},
},
},
{ {
'target_name': 'url_fetch_test', 'target_name': 'url_fetch_test',
'type': 'executable', 'type': 'executable',
......
rlz/rlz.gyp 0 → 100644
View file @ 4cfa7b62
# 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': 'rlz',
'type': 'none',
'msvs_guid': 'BF4F447B-72B5-4059-BE1B-F94337B1F385',
'copies': [
{
'destination': '<(PRODUCT_DIR)',
'files': [
'binaries/rlz.dll',
'binaries/rlz_dll.pdb',
],
},
],
},
],
}],
],
}
tools/memory_watcher/memory_watcher.gyp 0 → 100644
View file @ 4cfa7b62
# 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',
],
'targets': [
{
'target_name': 'memory_watcher',
'type': 'shared_library',
'msvs_guid': '3BD81303-4E14-4559-AA69-B30C3BAB08DD',
'dependencies': [
'../../base/base.gyp:base',
],
'defines': [
'BUILD_MEMORY_WATCHER',
],
'include_dirs': [
'../..',
],
'sources': [
'call_stack.cc',
'call_stack.h',
'dllmain.cc',
'hotkey.h',
'ia32_modrm_map.cc',
'ia32_opcode_map.cc',
'memory_hook.cc',
'memory_hook.h',
'memory_watcher.cc',
'memory_watcher.h',
'mini_disassembler.cc',
'preamble_patcher.cc',
'preamble_patcher.h',
'preamble_patcher_with_stub.cc',
],
},
],
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment