chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi - Issue 10946008: Componentize IgnoreNavigationResourceThrottle and add chrome and webview specific implementations.

Unified Diff: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi

Issue 10946008: Componentize IgnoreNavigationResourceThrottle and add chrome and webview specific implementations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixed presubmit warning for jni_generator.py Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java ('K') | « chrome/browser/component/navigation_interception/navigation_interception.gypi ('k') | chrome/browser/renderer_host/intercept_navigation_resource_throttle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ad15c3f3e7a64adf1dffc2c63e2c95081040833b..922e802f7ab1fe730426e009c517c7aafc1262b8 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

@@ -4,43 +4,47 @@

# found in the LICENSE file.

{

- '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',

+ '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',

+ ],

+ 'variables': {

+ 'package_name': 'web_contents_delegate_android',

+ 'java_in_dir': 'java',

+ },

+ 'includes': [ '../../../../build/java.gypi' ],

+ },

- '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',

- ],

- 'variables': {

- 'package_name': 'web_contents_delegate_android',

- 'java_in_dir': 'java',

- },

- 'includes': [ '../../../../build/java.gypi' ],

- },

+ }],

}