| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 component("child") { | 5 component("child") { |
| 6 output_name = "webkit_child" | 6 output_name = "webkit_child" |
| 7 sources = [ | 7 sources = [ |
| 8 "multipart_response_delegate.cc", | 8 "multipart_response_delegate.cc", |
| 9 "multipart_response_delegate.h", | 9 "multipart_response_delegate.h", |
| 10 "resource_loader_bridge.cc", | 10 "resource_loader_bridge.cc", |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 if (is_android) { | 32 if (is_android) { |
| 33 #deps += [ ":overscroller_jni_headers" ] TODO(GYP) | 33 #deps += [ ":overscroller_jni_headers" ] TODO(GYP) |
| 34 } | 34 } |
| 35 | 35 |
| 36 deps = [ | 36 deps = [ |
| 37 "//base", | 37 "//base", |
| 38 "//base:i18n", | 38 "//base:i18n", |
| 39 "//base/third_party/dynamic_annotations", | 39 "//base/third_party/dynamic_annotations", |
| 40 "//net", | 40 "//net", |
| 41 "//skia", | 41 "//skia", |
| 42 #"//third_party/WebKit/public:blink", TODO(GYP) | 42 "//third_party/WebKit/public:blink", |
| 43 "//ui/gfx", | 43 "//ui/gfx", |
| 44 "//ui/gfx/geometry", | 44 "//ui/gfx/geometry", |
| 45 "//ui/native_theme", | 45 "//ui/native_theme", |
| 46 "//url", | 46 "//url", |
| 47 "//v8", | 47 "//v8", |
| 48 "//webkit/common", | 48 "//webkit/common", |
| 49 ] | 49 ] |
| 50 } | 50 } |
| 51 | 51 |
| 52 #TODO(GYP) | 52 #TODO(GYP) |
| 53 #'target_name': 'overscroller_jni_headers', | 53 #'target_name': 'overscroller_jni_headers', |
| 54 #'type': 'none', | 54 #'type': 'none', |
| 55 #'variables': { | 55 #'variables': { |
| 56 # 'jni_gen_package': 'webkit', | 56 # 'jni_gen_package': 'webkit', |
| 57 # 'input_java_class': 'android/widget/OverScroller.class', | 57 # 'input_java_class': 'android/widget/OverScroller.class', |
| 58 #}, | 58 #}, |
| 59 #'includes': [ '../../build/jar_file_jni_generator.gypi' ], | 59 #'includes': [ '../../build/jar_file_jni_generator.gypi' ], |
| 60 | 60 |
| OLD | NEW |