move webkit/glue/fling_* to webkit/child

webkit/glue/webkit_glue.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
      # Disable narrowing-conversion-in-initialization-list warnings in that we
      # do not want to fix it in data file "webcursor_gtk_data.h".
      'cflags+': ['-Wno-narrowing'],
      'cflags_cc+': ['-Wno-narrowing'],
@@ skipping 45 matching lines @@
     },
 
     {
       'target_name': 'glue_child',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         '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',
           ],
         }],
       ],
     },
 
     {
       'target_name': 'glue_common',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
@@ skipping 122 matching lines @@
         'webkit_strings',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
         '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
       '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',
         'glue_serialize_deprecated.h',
         'image_decoder.cc',
         'image_decoder.h',
         'network_list_observer.h',
         'npruntime_util.cc',
         'npruntime_util.h',
         'resource_loader_bridge.cc',
@@ skipping 104 matching lines @@
               'dependencies': [
                  '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
                ],
                'export_dependent_settings': [
                  '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
                  '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                ],
             }],
           ],
         }],
-        ['OS=="android"', {
-          'dependencies': [
-            'overscroller_jni_headers',
-          ],
-        }],
-
       ],
     },
   ],
   'conditions': [
     ['use_third_party_translations==1', {
       'targets': [
         {
           'target_name': 'inspector_strings',
           'type': 'none',
           'variables': {
@@ skipping 20 matching lines @@
           'variables': {
             'jni_gen_package': 'webkit',
             'input_java_class': 'android/widget/OverScroller.class',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }