Index: webkit/child/webkit_child.gyp |
diff --git a/webkit/child/webkit_child.gyp b/webkit/child/webkit_child.gyp |
index 49a1ffe80412c8d63282c36297a50df0f4be9ab9..388809d2cd0f34fda443fa6329915eeb7dd46bf3 100644 |
--- a/webkit/child/webkit_child.gyp |
+++ b/webkit/child/webkit_child.gyp |
@@ -6,77 +6,22 @@ |
'variables': { |
'chromium_code': 1, |
}, |
- 'conditions': [ |
- ['OS=="android"', |
- { |
- 'targets': [ |
- { |
- 'target_name': 'overscroller_jni_headers', |
- 'type': 'none', |
- 'variables': { |
- 'jni_gen_package': 'webkit', |
- 'input_java_class': 'android/widget/OverScroller.class', |
- }, |
- 'includes': [ '../../build/jar_file_jni_generator.gypi' ], |
- }, |
- ], |
- } |
- ], |
- ], |
'targets': [ |
{ |
'target_name': 'webkit_child', |
'type': '<(component)', |
- 'variables': { 'enable_wexit_time_destructors': 1, }, |
'defines': [ |
'WEBKIT_CHILD_IMPLEMENTATION', |
], |
'dependencies': [ |
- '<(DEPTH)/base/base.gyp:base', |
- '<(DEPTH)/base/base.gyp:base_i18n', |
- '<(DEPTH)/base/base.gyp:base_static', |
- '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
- '<(DEPTH)/net/net.gyp:net', |
- '<(DEPTH)/skia/skia.gyp:skia', |
- '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', |
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx', |
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', |
- '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', |
- '<(DEPTH)/url/url.gyp:url_lib', |
- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
- ], |
- 'include_dirs': [ |
- # For JNI generated header. |
- '<(SHARED_INTERMEDIATE_DIR)/webkit', |
+ '../../base/base.gyp:base', |
+ '../../net/net.gyp:net', |
], |
- # This target exports a hard dependency because dependent targets may |
- # include the header generated above. |
- 'hard_dependency': 1, |
'sources': [ |
'resource_loader_bridge.cc', |
'resource_loader_bridge.h', |
'webkit_child_export.h', |
], |
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
- 'msvs_disabled_warnings': [ 4267 ], |
- 'conditions': [ |
- ['OS=="mac"', |
- { |
- 'link_settings': { |
- 'libraries': [ |
- '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', |
- ], |
- }, |
- } |
- ], |
- ['OS=="android"', |
- { |
- 'dependencies': [ |
- 'overscroller_jni_headers', |
- ], |
- } |
- ], |
- ], |
}, |
], |
} |