Remove inspector_resources target and use the upstreaming

inspector_resources target.

BUG=none
TEST=none. Manually confirmed DevTools worked.
Review URL: http://codereview.chromium.org/2825043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52612 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 112 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f8d27cb..ef8aec2 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -32,7 +32,7 @@
       'worker',
       'service',
       '../printing/printing.gyp:printing',
-      '../webkit/webkit.gyp:inspector_resources',
+      '../third_party/WebKit/WebKit/chromium/WebKit.gyp:inspector_resources',
     ],
     'nacl_win64_dependencies': [
       'common_nacl_win64',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index cf3c1b8..8c64029 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -37,6 +37,7 @@
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:inspector_resources',
         '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
         '<(DEPTH)/webkit/support/webkit_support.gyp:database',
@@ -44,7 +45,6 @@
         '<(DEPTH)/webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
-        '<(DEPTH)/webkit/webkit.gyp:inspector_resources',
       ],
       'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
       'sources': [
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 05a3d8d..5d5d604 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -5,28 +5,10 @@
 {
   'includes': [
     '../third_party/WebKit/WebKit/chromium/features.gypi',
-    '../third_party/WebKit/WebKit/chromium/WebKit.gypi',
-    '../third_party/WebKit/WebCore/WebCore.gypi',
     'tools/test_shell/test_shell.gypi',
   ],
   'variables': {
     'chromium_code': 1,
-
-    # List of DevTools source files, ordered by dependencies. It is used both
-    # for copying them to resource dir, and for generating 'devtools.html' file.
-    'devtools_files': [
-      '<@(devtools_css_files)',
-      '../v8/tools/codemap.js',
-      '../v8/tools/consarray.js',
-      '../v8/tools/csvparser.js',
-      '../v8/tools/logreader.js',
-      '../v8/tools/profile.js',
-      '../v8/tools/profile_view.js',
-      '../v8/tools/splaytree.js',
-      '<@(devtools_js_files)',
-    ],
-
-    'debug_devtools%': 0,
   },
   'targets': [
     {
@@ -43,98 +25,6 @@
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:DumpRenderTree'
       ],
     },
-    {
-      'target_name': 'inspector_resources',
-      'type': 'none',
-      'msvs_guid': '5330F8EE-00F5-D65C-166E-E3150171055D',
-      'dependencies': [
-        'devtools_html',
-      ],
-      'conditions': [
-        ['debug_devtools==0', {
-          'dependencies+': [
-            'concatenated_devtools_js',
-          ],
-        }],
-      ],
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)/resources/inspector',
-          'files': [
-            '<@(devtools_files)',
-            '<@(webinspector_files)',
-          ],
-          'conditions': [
-            ['debug_devtools==0', {
-              'files/': [['exclude', '\\.js$']],
-            }],
-          ],
-        },
-        {
-          'destination': '<(PRODUCT_DIR)/resources/inspector/Images',
-          'files': [
-            '<@(webinspector_image_files)', 
-            '<@(devtools_image_files)', 
-          ],
-        },
-      ],
-    },
-    {
-      'target_name': 'devtools_html',
-      'type': 'none',
-      'msvs_guid': '9BE5D4D5-E800-44F9-B6C0-27DF15A9D817',
-      'sources': [
-        '<(PRODUCT_DIR)/resources/inspector/devtools.html',
-      ],
-      'actions': [
-        {
-          'action_name': 'devtools_html',
-          'inputs': [
-            'build/generate_devtools_html.py',
-            # See issue 29695: WebKit.gypi is a source file for devtools.html.
-            '../third_party/WebKit/WebKit/chromium/WebKit.gypi',
-            '../third_party/WebKit/WebCore/inspector/front-end/inspector.html',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/resources/inspector/devtools.html',
-          ],
-          'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(devtools_files)'],
-        },
-      ],
-    },
-    {
-      'target_name': 'concatenated_devtools_js',
-      'type': 'none',
-      'msvs_guid': '8CCFDF4A-B702-4988-9207-623D1477D3E7',
-      'dependencies': [
-        'devtools_html',
-      ],
-      'sources': [
-        '<(PRODUCT_DIR)/resources/inspector/DevTools.js',
-      ],
-      'actions': [
-        {
-          'action_name': 'concatenate_devtools_js',
-          'script_name': 'build/concatenate_js_files.py',
-          'input_page': '<(PRODUCT_DIR)/resources/inspector/devtools.html',
-          'inputs': [
-            '<@(_script_name)',
-            '<@(_input_page)',
-            '<@(webinspector_files)',
-            '<@(devtools_files)',
-          ],
-          'search_path': [
-            '../third_party/WebKit/WebCore/inspector/front-end',
-            '../third_party/WebKit/WebKit/chromium/src/js',
-            '../v8/tools',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/resources/inspector/DevTools.js',
-          ],
-          'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_search_path)', '<@(_outputs)'],
-        },
-      ],
-    },
   ], # targets
 }