Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

components/web_contents_delegate_android/web_contents_delegate_android.gypi

Index: components/web_contents_delegate_android/web_contents_delegate_android.gypi
diff --git a/content/content_components_web_contents_delegate_android.gypi b/components/web_contents_delegate_android/web_contents_delegate_android.gypi
similarity index 53%
rename from content/content_components_web_contents_delegate_android.gypi
rename to components/web_contents_delegate_android/web_contents_delegate_android.gypi
index 6a36a1ca0aa408e92d684f56fb9c43bf44ae52f7..2a558a4812084a5ed2fa6391ca6d15dcff53f0e7 100644
--- a/content/content_components_web_contents_delegate_android.gypi
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.gypi
@@ -12,12 +12,12 @@
           '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': [
@@ -26,12 +26,12 @@
             '<(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',
           ],
         },
         {
@@ -39,25 +39,25 @@
           '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' ],
         },
       ],
     }],