Cleanup: Rename content_resources.gyp to content_resources.gypi and include in content.gyp.

TBR=benwells@chromium.org

Review URL: https://codereview.chromium.org/498673005

Cr-Commit-Position: refs/heads/master@{#291876}

content/content.gyp

@@ -25,6 +25,7 @@
     ['OS != "ios"', {
       'includes': [
         'content_common_mojo_bindings.gypi',
+        'content_resources.gypi',
         '../build/win_precompile.gypi',
       ],
     }],
@@ -152,7 +153,6 @@
           ],
           'dependencies': [
             'content_common',
-            'content_resources.gyp:content_resources',
           ],
           'export_dependent_settings': [
             'content_common',
@@ -169,6 +169,11 @@
                 'content_utility',
               ],
             }],
+            ['OS != "ios"', {
+              'dependencies': [
+                'content_resources',
+              ],
+            }],
           ],
         },
         {
@@ -182,7 +187,7 @@
           'conditions': [
             ['OS != "ios"', {
               'dependencies': [
-                'content_resources.gyp:content_resources',
+                'content_resources',
               ],
             }],
           ],
@@ -202,7 +207,7 @@
                 'content_child.gypi',
               ],
               'dependencies': [
-                'content_resources.gyp:content_resources',
+                'content_resources',
               ],
               # Disable c4267 warnings until we fix size_t to int truncations.
               'msvs_disabled_warnings': [ 4267, ],
@@ -255,7 +260,7 @@
               'dependencies': [
                 'content_child',
                 'content_common',
-                'content_resources.gyp:content_resources',
+                'content_resources',
               ],
               'conditions': [
                 ['chromium_enable_vtune_jit_for_v8==1', {
@@ -290,7 +295,7 @@
           'type': 'shared_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
-           'content_resources.gyp:content_resources',
+            'content_resources',
           ],
           'conditions': [
             ['chromium_enable_vtune_jit_for_v8==1', {
@@ -350,7 +355,7 @@
           # GN version: //content/common and //content/public/common
           'target_name': 'content_common',
           'type': 'none',
-          'dependencies': ['content', 'content_resources.gyp:content_resources'],
+          'dependencies': ['content', 'content_resources'],
           # Disable c4267 warnings until we fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
           'export_dependent_settings': ['content'],

content/content_resources.gyp → content/content_resources.gypi

@@ -2,9 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# TODO(jochen): make this a .gypi file and include it in content.gyp, once
-# content.gyp doesn't depend on gyp files from chrome/ anymore:
-# http://crbug.com/10394
 {
   'targets': [
     {

content/content_shell.gypi

@@ -36,8 +36,8 @@
         'content.gyp:content_plugin',
         'content.gyp:content_ppapi_plugin',
         'content.gyp:content_renderer',
+        'content.gyp:content_resources',
         'content.gyp:content_utility',
-        'content_resources.gyp:content_resources',
         'content_shell_resources',
         'copy_test_netscape_plugin',
         'layouttest_support_content',
@@ -439,7 +439,7 @@
         'app/resources/content_resources.gyp:content_resources',
         'app/strings/content_strings.gyp:content_strings',
         'browser/tracing/tracing_resources.gyp:tracing_resources',
-        'content_resources.gyp:content_resources',
+        'content.gyp:content_resources',
         'content_shell_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',

content/content_tests.gypi

@@ -746,7 +746,7 @@
             'content.gyp:content_gpu',
             'content.gyp:content_plugin',
             'content.gyp:content_renderer',
-            'content_resources.gyp:content_resources',
+            'content.gyp:content_resources',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../cc/cc.gyp:cc',
             '../cc/cc_tests.gyp:cc_test_support',
@@ -1074,8 +1074,8 @@
             'content.gyp:content_gpu',
             'content.gyp:content_plugin',
             'content.gyp:content_renderer',
+            'content.gyp:content_resources',
             'content_browser_test_support',
-            'content_resources.gyp:content_resources',
             'content_shell_lib',
             'content_shell_pak',
             'test_support_content',

extensions/extensions.gyp

@@ -588,7 +588,7 @@
       'dependencies': [
         'extensions_resources.gyp:extensions_resources',
         '../chrome/chrome_resources.gyp:chrome_resources',
-        '../content/content_resources.gyp:content_resources',
+        '../content/content.gyp:content_resources',
         '../gin/gin.gyp:gin',
         '../mojo/mojo_base.gyp:mojo_js_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
@@ -812,7 +812,7 @@
         # Need dev-tools related resources in shell_resources.pak and
         # devtools_resources.pak.
         '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
-        '../content/content_resources.gyp:content_resources',
+        '../content/content.gyp:content_resources',
         '../content/content_shell_and_tests.gyp:content_shell_resources',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',