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

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

Issue 7840010: Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 20 matching lines...) Expand all
31 'plugin_impl_mac.h', 31 'plugin_impl_mac.h',
32 'plugin_impl_mac.mm', 32 'plugin_impl_mac.mm',
33 'plugin_impl_win.cc', 33 'plugin_impl_win.cc',
34 'plugin_impl_win.h', 34 'plugin_impl_win.h',
35 'plugin_installer_base.cc', 35 'plugin_installer_base.cc',
36 'plugin_installer_base.h', 36 'plugin_installer_base.h',
37 'plugin_main.cc', 37 'plugin_main.cc',
38 'plugin_main.h', 38 'plugin_main.h',
39 ], 39 ],
40 'conditions': [ 40 'conditions': [
41 ['use_aura==1', { 41 ['OS=="win"', {
42 'sources/': [ 42 'link_settings': {
43 ['exclude', '^plugin_impl_win.cc'], 43 'libraries': ['-lurlmon.lib'],
44 ['exclude', '^plugin_impl_win.h'], 44 },
45 ], 45 'sources': [
46 }], 46 'default_plugin_resources.h',
47 ['OS=="win"', { 47 'install_dialog.cc',
48 'link_settings': { 48 'install_dialog.h',
49 'libraries': ['-lurlmon.lib'], 49 'plugin_database_handler.cc',
50 }, 50 'plugin_database_handler.h',
51 'sources': [ 51 'plugin_install_job_monitor.cc',
52 'default_plugin_resources.h', 52 'plugin_install_job_monitor.h',
53 'install_dialog.cc', 53 ],
54 'install_dialog.h', 54 }],
55 'plugin_database_handler.cc', 55 ['toolkit_uses_gtk == 1', {
56 'plugin_database_handler.h', 56 'dependencies': [
57 'plugin_install_job_monitor.cc', 57 '<(DEPTH)/build/linux/system.gyp:gtk',
58 'plugin_install_job_monitor.h', 58 ],
59 ], 59 }],
60 }],
61 ['toolkit_uses_gtk == 1', {
62 'dependencies': [
63 '<(DEPTH)/build/linux/system.gyp:gtk',
64 ],
65 }],
66 ], 60 ],
67 }, 61 },
68 # This can't be part of chrome.gyp:chrome_resources because then there'd 62 # This can't be part of chrome.gyp:chrome_resources because then there'd
69 # be a cyclic dependency. 63 # be a cyclic dependency.
70 { 64 {
71 'target_name': 'default_plugin_resources', 65 'target_name': 'default_plugin_resources',
72 'type': 'none', 66 'type': 'none',
73 'variables': { 67 'variables': {
74 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/default_plugin_resour ces', 68 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/default_plugin_resour ces',
75 }, 69 },
76 'actions': [ 70 'actions': [
77 { 71 {
78 'action_name': 'default_plugin_resources', 72 'action_name': 'default_plugin_resources',
79 'variables': { 73 'variables': {
80 'grit_grd_file': 'default_plugin_resources.grd', 74 'grit_grd_file': 'default_plugin_resources.grd',
81 }, 75 },
82 'includes': [ '../../build/grit_action.gypi' ], 76 'includes': [ '../../build/grit_action.gypi' ],
83 }, 77 },
84 ], 78 ],
85 'includes': [ '../../build/grit_target.gypi' ], 79 'includes': [ '../../build/grit_target.gypi' ],
86 }, 80 },
87 ], 81 ],
88 } 82 }
OLDNEW
« no previous file with comments | « chrome/common/native_web_keyboard_event_views.cc ('k') | content/browser/plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698