| Index: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi
|
| diff --git a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi
|
| index 23edd76bad48b92c4f083b1364bcddc8a2ecb439..5a9c00d6dfc21bf455cadb08ea0c6fb2d08ccdd4 100644
|
| --- a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi
|
| +++ b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi
|
| @@ -3,47 +3,20 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +# TODO(jknotten): Remove this file once external dependencies have changed to
|
| +# use the new location of this component at
|
| +# content/components/web_contents_delegate_android_java
|
| +
|
| {
|
| 'conditions': [
|
| ['OS=="android"', {
|
| 'targets': [
|
| {
|
| - 'target_name': 'web_contents_delegate_android',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../../../base/base.gyp:base',
|
| - '../../../content/content.gyp:content_browser',
|
| - '../../../content/content.gyp:content_common',
|
| - '../../../net/net.gyp:net',
|
| - '../../../skia/skia.gyp:skia',
|
| - '../../../ui/ui.gyp:ui',
|
| - '../../../webkit/support/webkit_support.gyp:glue',
|
| - 'browser_component_jni_headers',
|
| - ],
|
| - 'include_dirs': [
|
| - '../../..',
|
| - '../../../skia/config',
|
| - '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_component',
|
| - ],
|
| - 'sources': [
|
| - 'component_jni_registrar.cc',
|
| - 'component_jni_registrar.h',
|
| - 'web_contents_delegate_android.cc',
|
| - 'web_contents_delegate_android.h',
|
| - ],
|
| - },
|
| - {
|
| 'target_name': 'web_contents_delegate_android_java',
|
| 'type': 'none',
|
| 'dependencies': [
|
| - '<(DEPTH)/base/base.gyp:base',
|
| - '<(DEPTH)/content/content.gyp:content_java',
|
| + '../../../content/content.gyp:web_contents_delegate_android_java',
|
| ],
|
| - 'variables': {
|
| - 'package_name': 'web_contents_delegate_android',
|
| - 'java_in_dir': 'java',
|
| - },
|
| - 'includes': [ '../../../../build/java.gypi' ],
|
| },
|
| ],
|
| }],
|
|
|