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

Unified Diff: chrome/default_plugin/default_plugin.gyp

Issue 2803035: Move default_plugin out of webkit. (Closed)
Patch Set: '' Created 10 years, 5 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
« no previous file with comments | « chrome/default_plugin/DEPS ('k') | chrome/default_plugin/default_plugin_resources.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/default_plugin/default_plugin.gyp
diff --git a/webkit/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp
similarity index 71%
rename from webkit/default_plugin/default_plugin.gyp
rename to chrome/default_plugin/default_plugin.gyp
index 5339a3dff3431a952494629eafe807cfdeac6a53..b2852bfd7b6c3c4a9cae8ee6b7561a7cb69ce6ca 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/chrome/default_plugin/default_plugin.gyp
@@ -11,22 +11,19 @@
'target_name': 'default_plugin',
'type': '<(library)',
'dependencies': [
- '../../net/net.gyp:net_resources',
- '../../third_party/icu/icu.gyp:icui18n',
- '../../third_party/icu/icu.gyp:icuuc',
- '../../third_party/libxml/libxml.gyp:libxml',
- '../../third_party/npapi/npapi.gyp:npapi',
- '../support/webkit_support.gyp:webkit_resources',
- '../support/webkit_support.gyp:webkit_strings',
+ '<(DEPTH)/net/net.gyp:net_resources',
+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+ '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
],
'include_dirs': [
- '../..',
+ '<(DEPTH)',
'<(DEPTH)/third_party/wtl/include',
- # TODO(bradnelson): this should fall out of the dependencies.
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
],
'sources': [
- 'default_plugin_shared.h',
'plugin_impl_gtk.cc',
'plugin_impl_gtk.h',
'plugin_impl_mac.h',
@@ -54,7 +51,7 @@
}],
['OS=="linux"', {
'dependencies': [
- '../../build/linux/system.gyp:gtk',
+ '<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
],
« no previous file with comments | « chrome/default_plugin/DEPS ('k') | chrome/default_plugin/default_plugin_resources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698