Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

components/web_contents_delegate_android/web_contents_delegate_android.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Jói, 2013/01/10 21:17:13]

I think we want the .gypi files to live directly under src/components/.

Feel free to add per-file OWNERS for the .gypi to src/components/OWNERS.

[kaiwang, 2013/01/10 21:34:09]

From components/README, it seems suggesting to have foo.gypi under
components/foo.
For navigation_interception I added a gyp instead of gypi.
I don't know which is better. Let's choose a convention and I'll follow.

[boliu, 2013/01/10 21:40:25]

Right..so in the visitedlink one (https://codereview.chromium.org/11825011/) and
this Patch Set, I'm following the convection:

src/components/components.gyp # only includes from other gypi's
src/components/foo/foo.gypi # lists all targets of foo

If this is the path we follow, then whoever lands first will create a
components.gyp with one gypi line and those after will need to rebase :)

[Jói, 2013/01/10 21:51:23]

The convention is to keep .gypi files alongside the .gyp files that reference
them, to avoid confusing relative path situations.  See the .gyp and .gypi files
under src/content/ as an example.

 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   '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',
-            'content_browser',
-            'content_common',
             'web_contents_delegate_android_jni_headers',
           ],
           'include_dirs': [
             '..',
             '../skia/config',
             '<(SHARED_INTERMEDIATE_DIR)/web_contents_delegate_android',
           ],
           'sources': [
-            'components/web_contents_delegate_android/color_chooser_android.cc',
-            'components/web_contents_delegate_android/color_chooser_android.h',
-            'components/web_contents_delegate_android/component_jni_registrar.cc',
-            'components/web_contents_delegate_android/component_jni_registrar.h',
-            'components/web_contents_delegate_android/web_contents_delegate_android.cc',
-            'components/web_contents_delegate_android/web_contents_delegate_android.h',
+            'color_chooser_android.cc',
+            'color_chooser_android.h',
+            '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': [
             '../base/base.gyp:base',
-            'content_java',
+            '../content/content.gyp:content_java',
           ],
           'variables': {
             'package_name': 'web_contents_delegate_android',
-            'java_in_dir': 'components/web_contents_delegate_android/java',
+            'java_in_dir': 'android/java',
           },
-          'includes': [ '../build/java.gypi' ],
+          'includes': [ '../../build/java.gypi' ],
         },
         {
           'target_name': 'web_contents_delegate_android_jni_headers',
           'type': 'none',
           'sources': [
-            'components/web_contents_delegate_android/java/src/org/chromium/content/components/web_contents_delegate_android/ColorChooserAndroid.java',
-            'components/web_contents_delegate_android/java/src/org/chromium/content/components/web_contents_delegate_android/WebContentsDelegateAndroid.java',
+            'android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java',
+            'android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java',
           ],
           'variables': {
-            'jni_gen_dir': 'web_contents_delegate_android',
+            'jni_gen_dir': '.',

[boliu, 2013/01/10 20:20:22]

This is due to the gypi file moved relatively to the source files. I think
fixing this is better than updating include_dirs on line 26.

[Yaron, 2013/01/10 21:56:40]

So what does this path end up being?

[boliu, 2013/01/10 22:02:13]

<(SHARED_INTERMEDIATE_DIR)/web_contents_delegate_android

But we have already decided to move this gypi file up one level, so this change
will be reverted. See discussion at top of this file.

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