OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'target_defaults': { | 6 'target_defaults': { |
7 # Disable narrowing-conversion-in-initialization-list warnings in that we | 7 # Disable narrowing-conversion-in-initialization-list warnings in that we |
8 # do not want to fix it in data file "webcursor_gtk_data.h". | 8 # do not want to fix it in data file "webcursor_gtk_data.h". |
9 'cflags+': ['-Wno-narrowing'], | 9 'cflags+': ['-Wno-narrowing'], |
10 'cflags_cc+': ['-Wno-narrowing'], | 10 'cflags_cc+': ['-Wno-narrowing'], |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 }, | 56 }, |
57 | 57 |
58 { | 58 { |
59 'target_name': 'glue_child', | 59 'target_name': 'glue_child', |
60 'type': '<(component)', | 60 'type': '<(component)', |
61 'variables': { 'enable_wexit_time_destructors': 1, }, | 61 'variables': { 'enable_wexit_time_destructors': 1, }, |
62 'defines': [ | 62 'defines': [ |
63 'WEBKIT_CHILD_IMPLEMENTATION', | 63 'WEBKIT_CHILD_IMPLEMENTATION', |
64 ], | 64 ], |
65 'dependencies': [ | 65 'dependencies': [ |
| 66 '<(DEPTH)/base/base.gyp:base', |
66 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 67 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
67 | 68 |
68 # TODO(scottmg): crbug.com/237249 | 69 # TODO(scottmg): crbug.com/237249 |
69 'glue', | 70 'glue', |
70 ], | 71 ], |
71 | 72 |
72 'sources': [ | 73 'sources': [ |
| 74 '../child/fling_animator_impl_android.cc', |
| 75 '../child/fling_animator_impl_android.h', |
| 76 '../child/fling_curve_configuration.cc', |
| 77 '../child/fling_curve_configuration.h', |
| 78 '../child/webkit_child_export.h', |
73 '../child/webkitplatformsupport_child_impl.cc', | 79 '../child/webkitplatformsupport_child_impl.cc', |
74 '../child/webkitplatformsupport_child_impl.h', | 80 '../child/webkitplatformsupport_child_impl.h', |
75 ], | 81 ], |
| 82 |
| 83 'conditions': [ |
| 84 ['OS=="android"', { |
| 85 'dependencies': [ |
| 86 'overscroller_jni_headers', |
| 87 ], |
| 88 }], |
| 89 ], |
76 }, | 90 }, |
77 | 91 |
78 { | 92 { |
79 'target_name': 'glue_common', | 93 'target_name': 'glue_common', |
80 'type': '<(component)', | 94 'type': '<(component)', |
81 'variables': { 'enable_wexit_time_destructors': 1, }, | 95 'variables': { 'enable_wexit_time_destructors': 1, }, |
82 'defines': [ | 96 'defines': [ |
83 'WEBKIT_COMMON_IMPLEMENTATION', | 97 'WEBKIT_COMMON_IMPLEMENTATION', |
84 ], | 98 ], |
85 'dependencies': [ | 99 'dependencies': [ |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 'webkit_strings', | 219 'webkit_strings', |
206 ], | 220 ], |
207 'include_dirs': [ | 221 'include_dirs': [ |
208 '<(INTERMEDIATE_DIR)', | 222 '<(INTERMEDIATE_DIR)', |
209 '<(SHARED_INTERMEDIATE_DIR)/webkit', | 223 '<(SHARED_INTERMEDIATE_DIR)/webkit', |
210 '<(SHARED_INTERMEDIATE_DIR)/ui', | 224 '<(SHARED_INTERMEDIATE_DIR)/ui', |
211 ], | 225 ], |
212 'sources': [ | 226 'sources': [ |
213 'cursor_utils.cc', | 227 'cursor_utils.cc', |
214 'cursor_utils.h', | 228 'cursor_utils.h', |
215 'fling_curve_configuration.cc', | |
216 'fling_curve_configuration.h', | |
217 'fling_animator_impl_android.cc', | |
218 'fling_animator_impl_android.h', | |
219 'ftp_directory_listing_response_delegate.cc', | 229 'ftp_directory_listing_response_delegate.cc', |
220 'ftp_directory_listing_response_delegate.h', | 230 'ftp_directory_listing_response_delegate.h', |
221 'glue_serialize_deprecated.cc', | 231 'glue_serialize_deprecated.cc', |
222 'glue_serialize_deprecated.h', | 232 'glue_serialize_deprecated.h', |
223 'image_decoder.cc', | 233 'image_decoder.cc', |
224 'image_decoder.h', | 234 'image_decoder.h', |
225 'network_list_observer.h', | 235 'network_list_observer.h', |
226 'npruntime_util.cc', | 236 'npruntime_util.cc', |
227 'npruntime_util.h', | 237 'npruntime_util.h', |
228 'resource_loader_bridge.cc', | 238 'resource_loader_bridge.cc', |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 'dependencies': [ | 343 'dependencies': [ |
334 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', | 344 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', |
335 ], | 345 ], |
336 'export_dependent_settings': [ | 346 'export_dependent_settings': [ |
337 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', | 347 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', |
338 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | 348 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
339 ], | 349 ], |
340 }], | 350 }], |
341 ], | 351 ], |
342 }], | 352 }], |
343 ['OS=="android"', { | |
344 'dependencies': [ | |
345 'overscroller_jni_headers', | |
346 ], | |
347 }], | |
348 | |
349 ], | 353 ], |
350 }, | 354 }, |
351 ], | 355 ], |
352 'conditions': [ | 356 'conditions': [ |
353 ['use_third_party_translations==1', { | 357 ['use_third_party_translations==1', { |
354 'targets': [ | 358 'targets': [ |
355 { | 359 { |
356 'target_name': 'inspector_strings', | 360 'target_name': 'inspector_strings', |
357 'type': 'none', | 361 'type': 'none', |
358 'variables': { | 362 'variables': { |
(...skipping 20 matching lines...) Expand all Loading... |
379 'variables': { | 383 'variables': { |
380 'jni_gen_package': 'webkit', | 384 'jni_gen_package': 'webkit', |
381 'input_java_class': 'android/widget/OverScroller.class', | 385 'input_java_class': 'android/widget/OverScroller.class', |
382 }, | 386 }, |
383 'includes': [ '../../build/jar_file_jni_generator.gypi' ], | 387 'includes': [ '../../build/jar_file_jni_generator.gypi' ], |
384 }, | 388 }, |
385 ], | 389 ], |
386 }], | 390 }], |
387 ], | 391 ], |
388 } | 392 } |
OLD | NEW |