Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: webkit/default_plugin/default_plugin.gyp

Issue 165543: Revert "Reverting 23406" as it didn't break any tests.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/widget/widget_win.cc ('k') | webkit/default_plugin/plugin_impl_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../../build/common.gypi', 7 '../../build/common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 ], 10 ],
11 'conditions': [ 11 'conditions': [
12 ['OS=="win"', { 12 ['OS=="win"', {
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'default_plugin', 15 'target_name': 'default_plugin',
16 'type': '<(library)', 16 'type': '<(library)',
17 'dependencies': [ 17 'dependencies': [
18 '../../net/net.gyp:net_resources', 18 '../../net/net.gyp:net_resources',
19 '../../third_party/icu38/icu38.gyp:icui18n', 19 '../../third_party/icu38/icu38.gyp:icui18n',
20 '../../third_party/icu38/icu38.gyp:icuuc', 20 '../../third_party/icu38/icu38.gyp:icuuc',
21 '../../third_party/libxml/libxml.gyp:libxml', 21 '../../third_party/libxml/libxml.gyp:libxml',
22 '../../third_party/npapi/npapi.gyp:npapi', 22 '../../third_party/npapi/npapi.gyp:npapi',
23 '../activex_shim/activex_shim.gyp:activex_shim', 23 '../activex_shim/activex_shim.gyp:activex_shim',
24 '../webkit.gyp:webkit_resources', 24 '../webkit.gyp:webkit_resources',
25 '../webkit.gyp:webkit_strings', 25 '../webkit.gyp:webkit_strings',
26 ], 26 ],
27 'include_dirs': [ 27 'include_dirs': [
28 '../..', 28 '../..',
29 '../../chrome/third_party/wtl/include',
29 # TODO(bradnelson): this should fall out of the dependencies. 30 # TODO(bradnelson): this should fall out of the dependencies.
30 '<(SHARED_INTERMEDIATE_DIR)/webkit', 31 '<(SHARED_INTERMEDIATE_DIR)/webkit',
31 ], 32 ],
32 'msvs_guid': '5916D37D-8C97-424F-A904-74E52594C2D6', 33 'msvs_guid': '5916D37D-8C97-424F-A904-74E52594C2D6',
33 'sources': [ 34 'sources': [
34 'activex_installer.cc', 35 'activex_installer.cc',
35 'activex_installer.h', 36 'activex_installer.h',
36 'default_plugin.cc', 37 'default_plugin.cc',
37 'default_plugin_resources.h', 38 'default_plugin_resources.h',
38 'default_plugin_shared.h', 39 'default_plugin_shared.h',
39 'install_dialog.cc', 40 'install_dialog.cc',
40 'install_dialog.h', 41 'install_dialog.h',
41 'plugin_database_handler.cc', 42 'plugin_database_handler.cc',
42 'plugin_database_handler.h', 43 'plugin_database_handler.h',
43 'plugin_impl_win.cc', 44 'plugin_impl_win.cc',
44 'plugin_impl_win.h', 45 'plugin_impl_win.h',
45 'plugin_install_job_monitor.cc', 46 'plugin_install_job_monitor.cc',
46 'plugin_install_job_monitor.h', 47 'plugin_install_job_monitor.h',
47 'plugin_main.cc', 48 'plugin_main.cc',
48 'plugin_main.h', 49 'plugin_main.h',
49 ], 50 ],
50 'link_settings': { 51 'link_settings': {
51 'libraries': ['-lurlmon.lib'], 52 'libraries': ['-lurlmon.lib'],
52 }, 53 },
53 }, 54 },
54 ], 55 ],
55 },], 56 },],
56 ], 57 ],
57 } 58 }
OLDNEW
« no previous file with comments | « views/widget/widget_win.cc ('k') | webkit/default_plugin/plugin_impl_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698