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

Unified Diff: webkit/glue/webkit_glue.gypi

Issue 16424008: move webkit/glue/fling_* to webkit/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android 5 Created 7 years, 6 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 | « webkit/glue/fling_curve_configuration.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index ae1c5eea148756b66e1bd984d35df38228054459..35b07c172257423d24e8c89300fc40c1dcc7ea05 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -63,21 +63,33 @@
'WEBKIT_CHILD_IMPLEMENTATION',
],
'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '<(DEPTH)/ui/ui.gyp:ui',
# TODO(scottmg): crbug.com/237249
'glue',
],
-
+
+ 'include_dirs': [
+ # For JNI generated header.
+ '<(SHARED_INTERMEDIATE_DIR)/webkit',
+ ],
+
'sources': [
+ '../child/fling_animator_impl_android.cc',
+ '../child/fling_animator_impl_android.h',
+ '../child/fling_curve_configuration.cc',
+ '../child/fling_curve_configuration.h',
+ '../child/webkit_child_export.h',
'../child/webkitplatformsupport_child_impl.cc',
'../child/webkitplatformsupport_child_impl.h',
],
'conditions': [
- ['component=="shared_library"', {
+ ['OS=="android"', {
'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
+ 'overscroller_jni_headers',
],
}],
],
@@ -220,10 +232,6 @@
'sources': [
'cursor_utils.cc',
'cursor_utils.h',
- 'fling_curve_configuration.cc',
- 'fling_curve_configuration.h',
- 'fling_animator_impl_android.cc',
- 'fling_animator_impl_android.h',
'ftp_directory_listing_response_delegate.cc',
'ftp_directory_listing_response_delegate.h',
'glue_serialize_deprecated.cc',
@@ -348,12 +356,6 @@
}],
],
}],
- ['OS=="android"', {
- 'dependencies': [
- 'overscroller_jni_headers',
- ],
- }],
-
],
},
],
« no previous file with comments | « webkit/glue/fling_curve_configuration.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698