Index: content/components/navigation_interception/navigation_interception.gypi |
diff --git a/chrome/browser/component/navigation_interception/navigation_interception.gypi b/content/components/navigation_interception/navigation_interception.gypi |
similarity index 57% |
rename from chrome/browser/component/navigation_interception/navigation_interception.gypi |
rename to content/components/navigation_interception/navigation_interception.gypi |
index af9de6ea9bd8bae81b2452b1c456a2abaf2ea882..7730a6d5d70cf7bc1b27cd4e34d45fc497929a29 100644 |
--- a/chrome/browser/component/navigation_interception/navigation_interception.gypi |
+++ b/content/components/navigation_interception/navigation_interception.gypi |
@@ -9,15 +9,15 @@ |
'target_name': 'navigation_interception', |
Jói
2012/11/05 16:02:01
There was a recent discussion on chromium-dev@ (ht
John Knottenbelt
2012/11/05 16:15:14
I've been struggling with the pathname relativizat
jam
2012/11/05 20:33:13
sgtm
|
'type': 'static_library', |
'dependencies': [ |
- '../../../base/base.gyp:base', |
- '../../../content/content.gyp:content_browser', |
- '../../../content/content.gyp:content_common', |
- '../../../net/net.gyp:net', |
+ '../base/base.gyp:base', |
+ '../net/net.gyp:net', |
+ 'content_browser', |
+ 'content_common', |
], |
'include_dirs': [ |
- '../../../..', |
- '../../../../skia/config', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_component', |
+ '../../..', |
+ '../../../skia/config', |
+ '<(SHARED_INTERMEDIATE_DIR)/navigation_interception', |
], |
'sources': [ |
@@ -27,7 +27,7 @@ |
'conditions': [ |
['OS=="android"', { |
'dependencies': [ |
- 'browser_component_jni_headers', |
+ 'navigation_interception_jni_headers', |
], |
'sources': [ |
'component_jni_registrar.cc', |
@@ -46,13 +46,25 @@ |
'target_name': 'navigation_interception_java', |
'type': 'none', |
'dependencies': [ |
- '../../../base/base.gyp:base', |
+ '../base/base.gyp:base', |
], |
'variables': { |
'package_name': 'navigation_interception', |
'java_in_dir': 'java', |
}, |
- 'includes': [ '../../../../build/java.gypi' ], |
+ 'includes': [ '../../../build/java.gypi' ], |
+ }, |
+ { |
+ 'target_name': 'navigation_interception_jni_headers', |
+ 'type': 'none', |
+ 'sources': [ |
+ 'java/src/org/chromium/content/components/navigation_interception/InterceptNavigationDelegate.java', |
+ ], |
+ 'variables': { |
+ # We need ../.. due to path name relativization of jni_gen_dir. |
+ 'jni_gen_dir': '../../navigation_interception', |
+ }, |
+ 'includes': [ '../../../build/jni_generator.gypi' ], |
}, |
], |
}], |