Revert 209420 "Factor out content shell and tests into a standal..."

trunk/src/content/content_shell.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
     'content_shell_version': '19.77.34.5',
     'conditions': [
       ['OS=="linux"', {
        'use_custom_freetype%': 1,
       }, {
        'use_custom_freetype%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'content_shell_lib',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'],
       'variables': {
         'chromium_code': 1,
       },
       'dependencies': [
-        'content.gyp:content_app',
-        'content.gyp:content_browser',
-        'content.gyp:content_common',
-        'content.gyp:content_gpu',
-        'content.gyp:content_plugin',
-        'content.gyp:content_ppapi_plugin',
-        'content.gyp:content_renderer',
-        'content.gyp:content_utility',
-        'content.gyp:content_worker',
+        'content_app',
+        'content_browser',
+        'content_common',
+        'content_gpu',
+        'content_plugin',
+        'content_ppapi_plugin',
+        'content_renderer',
+        'content_shell_resources',
+        'content_utility',
+        'content_worker',
+        'test_support_content',
         'content_resources.gyp:content_resources',
-        'content_shell_resources',
-        'test_support_content',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/all.gyp:blink_testing',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
@@ skipping 605 matching lines @@
               'ldflags': [
                 '-lgabi++',  # For rtti
               ],
             }],
           ],
         },
         {
           'target_name': 'content_shell_java',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_java',
+            'content_java',
           ],
           'variables': {
             'java_in_dir': '../content/shell/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.content_shell',
             'R_package_relpath': 'org/chromium/content_shell',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           # content_shell_apk creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
           # content_shell_apk_java. Dependents of content_shell_apk receive its
           # jar path in the variable 'apk_output_jar_path'. This target should
           # only be used by targets which instrument content_shell_apk.
           'target_name': 'content_shell_apk_java',
           'type': 'none',
           'dependencies': [
             'content_shell_apk',
           ],
           'includes': [ '../build/apk_fake_jar.gypi' ],
         },
         {
           'target_name': 'content_shell_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_java',
+            'content_java',
             'content_java_test_support',
             'content_shell_java',
             'libcontent_shell_content_view',
             '../base/base.gyp:base_java',
             '../media/media.gyp:media_java',
             '../net/net.gyp:net_java',
             '../ui/ui.gyp:ui_java',
           ],
           'variables': {
             'apk_name': 'ContentShell',
             'manifest_package_name': 'org.chromium.content_shell_apk',
             'java_in_dir': 'shell/android/shell_apk',
             'resource_dir': 'shell/android/shell_apk/res',
             'native_lib_target': 'libcontent_shell_content_view',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ]
 }