Factor out content shell and tests into a standalone gyp

content/content_tests.gypi

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

[tfarina, 2013/06/23 00:51:11]

better to make this a content_tests.gyp. I also faced the same circular problem
in ui/

[mnaganov (inactive), 2013/07/01 09:17:51]

See my previous reply.

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         '../media/media.gyp:media',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
-        'content_app',
-        'content_browser',
-        'content_common',
+        'content.gyp:content_app',
+        'content.gyp:content_browser',
+        'content.gyp:content_common',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'public/test/browser_test_base.cc',
         'public/test/browser_test_base.h',
         'public/test/browser_test.h',
         'public/test/browser_test_utils.cc',
         'public/test/browser_test_utils.h',
@@ skipping 122 matching lines @@
             ['include', '^public/test/test_content_client_initializer\\.cc$'],
             ['include', '^public/test/test_notification_tracker\\.cc$'],
             ['include', '^public/test/test_utils\\.cc$'],
             ['include', '^public/test/unittest_test_suite\\.cc$'],
             ['include', '^test/content_test_suite\\.cc$'],
             ['include', '^test/test_content_browser_client\\.cc$'],
             ['include', '^test/test_content_client\\.cc$'],
           ],
         }, {  # OS != "ios"
           'dependencies': [
-            'content_child',
-            'content_ppapi_plugin',
-            'content_utility',
-            'content_worker',
+            'content.gyp:content_child',
+            'content.gyp:content_ppapi_plugin',
+            'content.gyp:content_utility',
+            'content.gyp:content_worker',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner',
             '../ui/surface/surface.gyp:surface',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
             '../webkit/support/webkit_support.gyp:webkit_support_common',
@@ skipping 60 matching lines @@
             'test_support_content_jni_headers',
           ],
         }],
       ],
     },
     {
       'target_name': 'content_unittests',
       'type': '<(gtest_target_type)',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
-        'content_browser',
-        'content_common',
+        'content.gyp:content_browser',
+        'content.gyp:content_common',
         'test_support_content',
         'browser/speech/proto/speech_proto.gyp:speech_proto',
         '../base/base.gyp:test_support_base',
         '../crypto/crypto.gyp:crypto',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ skipping 293 matching lines @@
             # iOS only needs a small portion of content; exclude all the
             # implementation, and re-include what is used.
             ['exclude', '\\.(cc|mm)$'],
             ['include', '_ios\\.(cc|mm)$'],
             ['include', '^browser/notification_service_impl_unittest\\.cc$'],
             ['include', '^browser/web_contents/navigation_entry_impl_unittest\\.cc$'],
             ['include', '^test/run_all_unittests\\.cc$'],
           ],
         }, {  # OS != "ios"
           'dependencies': [
-            'content_browser',
-            'content_child',
-            'content_gpu',
-            'content_plugin',
-            'content_renderer',
+            'content.gyp:content_browser',
+            'content.gyp:content_child',
+            'content.gyp:content_gpu',
+            'content.gyp:content_plugin',
+            'content.gyp:content_renderer',
             'content_resources.gyp:content_resources',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../gpu/gpu.gyp:gpu',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../ipc/ipc.gyp:test_support_ipc',
             '../jingle/jingle.gyp:jingle_glue_test_util',
             '../media/media.gyp:shared_memory_support',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/icu/icu.gyp:icuuc',
@@ skipping 150 matching lines @@
     },
   ],
   'conditions': [
     ['OS!="ios"', {
       'targets': [
         {
           'target_name': 'content_browsertests',
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content_common',
-            'content_gpu',
-            'content_plugin',
-            'content_renderer',
+            'content.gyp:content_common',
+            'content.gyp:content_gpu',
+            'content.gyp:content_plugin',
+            'content.gyp:content_renderer',
             'content_shell_lib',
             'content_shell_pak',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../gpu/gpu.gyp:gpu',
             '../ipc/ipc.gyp:test_support_ipc',
             '../net/net.gyp:net_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
@@ skipping 225 matching lines @@
                 ['exclude', '^browser/speech/'],
               ]
             }],
           ],
         },
         {
           'target_name': 'content_gl_tests',
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content_common',
+            'content.gyp:content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
             '../ui/ui.gyp:ui',
             '../ui/gl/gl.gyp:gl',
             '../third_party/WebKit/public/blink.gyp:blink',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'common/gpu/client/gl_helper_unittests.cc',
           ],
         },
         {
           'target_name': 'content_gl_benchmark',
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content_common',
+            'content.gyp:content_common',
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
             '../ui/ui.gyp:ui',
             '../ui/gl/gl.gyp:gl',
             '../third_party/WebKit/public/blink.gyp:blink',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'common/gpu/client/gl_helper_benchmark.cc',
           ],
         },
       ],
     }],
     ['chromeos==1 or OS=="win" or OS=="android"', {
       'targets': [
           {
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',
             'dependencies': [
-              'content',
+              'content.gyp:content',
               '../base/base.gyp:base',
               '../testing/gtest.gyp:gtest',
               '../media/media.gyp:media',
               '../ui/gl/gl.gyp:gl',
               '../ui/ui.gyp:ui',
             ],
             'include_dirs': [
               '<(DEPTH)/third_party/khronos',
             ],
             'sources': [
@@ skipping 48 matching lines @@
             'msvs_disabled_warnings': [ 4267, ],
           },
         ]
     }],
     ['chromeos == 1 or OS == "linux"', {
       'targets': [
         {
           'target_name': 'h264_parser_unittest',
           'type': 'executable',
           'dependencies': [
-            'content_common',
+            'content.gyp:content_common',
             '../base/base.gyp:base',
             '../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'common/gpu/media/h264_bit_reader_unittest.cc',
             'common/gpu/media/h264_parser_unittest.cc',
           ],
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }
       ],
     }],
     # Special target to wrap a gtest_target_type==shared_library
     # content_unittests into an android apk for execution.
     # See base.gyp for TODO(jrg)s about this strategy.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [
-            'content_java',
+            'content.gyp:content_java',
             'content_unittests',
           ],
           'variables': {
             'test_suite_name': 'content_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
+            'content.gyp:content_java',
             'content_browsertests',
-            'content_java',
             'content_java_test_support',
             'content_shell_java',
           ],
           'variables': {
             'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
             'resource_dir': 'shell/android/browsertests_apk/res',
             'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
@@ skipping 31 matching lines @@
             'jni_gen_package': 'content/public/test',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
-            'content_common',
-            'content_java',
+            'content.gyp:content_common',
+            'content.gyp:content_java',
           ],
           'variables': {
             'java_in_dir': '../content/public/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [
-            'content_java',
+            'content.gyp:content_java',
             'content_java_test_support',
             'content_shell_apk_java',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_javatests',
             '../base/base.gyp:base_java_test_support',
             '../media/media.gyp:media_java',
             '../media/media.gyp:media_test_support',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
             '../tools/android/forwarder2/forwarder.gyp:forwarder2',
           ],
           'variables': {
             'apk_name': 'ContentShellTest',
             'java_in_dir': 'shell/android/javatests',
             'resource_dir': 'shell/android/shell_apk/res',
             'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }