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

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 overscroller jni generation 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
Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 863dc516b60722ee4d586b8ccb57537eb1a13a01..9b09df15ee770267258d5e5e95db9a9525951ff2 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -63,16 +63,30 @@
'WEBKIT_CHILD_IMPLEMENTATION',
],
'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
# TODO(scottmg): crbug.com/237249
'glue',
],
-
+
'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': [
+ ['OS=="android"', {
+ 'dependencies': [
+ 'overscroller_jni_headers',
+ ],
+ }],
+ ],
},
{
@@ -212,10 +226,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',
@@ -340,12 +350,6 @@
}],
],
}],
- ['OS=="android"', {
- 'dependencies': [
- 'overscroller_jni_headers',
- ],
- }],
-
],
},
],

Powered by Google App Engine
This is Rietveld 408576698