Move navigation interception component to content/components

content/components/navigation_interception/navigation_interception.gypi

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..b62ab0241e94b9d717adcc2a8d44acd9fba25f74 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',
       '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.gyp:content_browser',
+        '../content.gyp:content_common',
       ],
       'include_dirs': [
-        '../../../..',
-        '../../../../skia/config',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_component',
+        '../../..',
+        '../../../skia/config',
+        '<(SHARED_INTERMEDIATE_DIR)/content/components',

[mkosiba (inactive), 2012/11/02 15:36:27]

maybe use SHARED_INTERMEDIATES_DIR/content/components/navigation_interception
(or if you like what I proposed below:
SHARED_INTERMEDIATES_DIR/navigation_interception). Then you could simplify the
DEPS rule to be "+jni".

[John Knottenbelt, 2012/11/02 16:34:44]

Done.

 
       ],
       '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,24 @@
           '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/chrome/browser/component/navigation_interception/InterceptNavigationDelegate.java',
+          ],
+          'variables': {
+            'jni_gen_dir': '../content/components/navigation_interception',

[mkosiba (inactive), 2012/10/31 22:41:26]

why not just navigation_interception?

also.. this shouldn't work, if you look at jni_generator.gypi the path where
we'd place the generated files under would be
out/Debug/../content/components/navigation_interception

[John Knottenbelt, 2012/11/02 14:48:25]

This is a possibility, do you think that prefixing with content/components in
the out/Debug/gen directory is redundant? It seemed to me to keep the generated
files out of the top-level generated files namespace.
There is an unfortunate feature of gyp that variables ending in _dir are
"path-name relativised", which means that gyp wants to prefix any relative paths
with the relative path between the gypi and the gyp that is including it.

http://code.google.com/p/gyp/wiki/InputFormatReference#Pathname_Relativization

This is the reason for the '../'. The proper fix is to use a differently named
variable as input into the jni_generator.gypi include. I think this is best
fixed in a separate patch (I'll file a bug).

jni_generator.gypi will then join the SHARED_INTERMEDIATES_DIR, which is
out/Debug/gen with jni_gen_dir, so the output will be
out/Debug/gen/navigation_interception/../content/components/navigation_interception
which gyp then rewrites as
out/Debug/gen/content/components/navigation_interception.

[mkosiba (inactive), 2012/11/02 15:36:27]

ah.. I see.. I didn't know about the relativization feature. That being said,
everyone else seems to follow a convention of 'jni_gen_dir' : <target_name>.

I don't think there would be a problem if you simply used
'../navigation_interception' (and added a comment about the .. being there due
to relativization).
I'm assuming the 'common folder' problem you're referring to was due to the fact
that the browser_component_jni_headers spat out all of the generated headers
into one folder, but if you have separate targets those should output to
separate folders.

I guess the main reason I'd get rid of the content/components prefix is that we
don't have a separate namespace for each component.

[John Knottenbelt, 2012/11/02 16:34:44]

Done.

+          },
+          'includes': [ '../../../build/jni_generator.gypi' ],
         },
       ],
     }],