Revert r100988 (gpy refactoring for content dll).

TBR=darin
BUG=
TEST=

Review URL: http://codereview.chromium.org/7892021

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

11 files changed, 97 insertions, 199 deletions

diff --git a/content/content.gyp b/content/content.gyp
index 20b8581..fd7776d 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -5,178 +5,19 @@
 {
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
-    'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
   },
   'includes': [
     '../build/win_precompile.gypi',
+    'content_app.gypi',
+    'content_browser.gypi',
+    'content_common.gypi',
+    'content_gpu.gypi',
+    'content_plugin.gypi',
+    'content_ppapi_plugin.gypi',
+    'content_renderer.gypi',
     'content_shell.gypi',
     'content_tests.gypi',
-  ],
-  'conditions': [
-   # In component mode, we build all of content as a single DLL.
-   # However, in the static mode, we need to build content as multiple
-   # targets in order to prevent dependencies from getting introduced
-   # upstream unnecessarily (e.g., content_renderer depends on allocator
-   # and chrome_exe depends on content_common but we don't want
-   # chrome_exe to have to depend on allocator).
-   # TODO(dpranke): Uncomment: ['component == "static_library"', {
-   ['1 == 1', {
-     'target_defaults': {
-       'defines': [
-         'CONTENT_IMPLEMENTATION',
-       ],
-     },
-     'targets': [
-      {'target_name': 'content',
-       'type': 'none',
-       'dependencies': [
-        'content_app',
-        'content_browser',
-        'content_common',
-        'content_gpu',
-        'content_plugin',
-        'content_ppapi_plugin',
-        'content_renderer',
-        'content_utility',
-        'content_worker',
-       ],
-      },
-      {'target_name': 'content_app',
-       'type': 'static_library',
-       'includes': [
-          'content_app.gypi',
-        ],
-       'dependencies': [
-          'content_common',
-        ],
-      },
-      {'target_name': 'content_browser',
-       'type': 'static_library',
-       'includes': [
-          'content_browser.gypi',
-        ],
-       'dependencies': [
-          'content_common',
-        ],
-      },
-      {'target_name': 'content_common',
-       'type': 'static_library',
-       'includes': [
-          'content_common.gypi',
-        ],
-      },
-      {'target_name': 'content_gpu',
-       'type': 'static_library',
-       'includes': [
-          'content_gpu.gypi',
-        ],
-       'dependencies': [
-          'content_common',
-        ],
-      },
-      {'target_name': 'content_plugin',
-       'type': 'static_library',
-       'includes': [
-          'content_plugin.gypi',
-        ],
-       'dependencies': [
-          'content_common',
-        ],
-      },
-      {'target_name': 'content_ppapi_plugin',
-       'type': 'static_library',
-       'includes': [
-          'content_ppapi_plugin.gypi',
-        ],
-      },
-      {'target_name': 'content_renderer',
-       'type': 'static_library',
-       'includes': [
-          'content_renderer.gypi',
-        ],
-       'dependencies': [
-          'content_common',
-        ],
-      },
-      {'target_name': 'content_utility',
-       'type': 'static_library',
-       'includes': [
-          'content_utility.gypi',
-        ],
-       'dependencies': [
-          'content_common',
-        ],
-      },
-      {'target_name': 'content_worker',
-       'type': 'static_library',
-       'includes': [
-          'content_worker.gypi',
-       ],
-       'dependencies': [
-          'content_common',
-        ],
-      },
-     ],
-    },
-    { # component != static_library
-     'target_defaults': {
-       'defines': [
-         'CONTENT_IMPLEMENTATION',
-       ],
-     },
-     'targets': [
-      {'target_name': 'content',
-       'type': 'shared_library',
-       'includes': [
-        'content_app.gypi',
-        'content_browser.gypi',
-        'content_common.gypi',
-        'content_gpu.gypi',
-        'content_plugin.gypi',
-        'content_ppapi_plugin.gypi',
-        'content_renderer.gypi',
-        'content_utility.gypi',
-        'content_worker.gypi',
-       ],
-      },
-      {'target_name': 'content_app',
-       'type': 'none',
-       'dependencies': ['content', 'content_browser'],
-      },
-      {'target_name': 'content_browser',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-      {'target_name': 'content_common',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-      {'target_name': 'content_gpu',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-      {'target_name': 'content_plugin',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-      {'target_name': 'content_ppapi_plugin',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-      {'target_name': 'content_renderer',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-      {'target_name': 'content_utility',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-      {'target_name': 'content_worker',
-       'type': 'none',
-       'dependencies': ['content'],
-      },
-     ],
-    },
-   ],
+    'content_utility.gypi',
+    'content_worker.gypi',
   ],
 }
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 996df28..afb9c2b 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -3,11 +3,16 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation
+  'targets': [
+    {
+      'target_name': 'content_app',
+      'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'dependencies': [
+        'content_browser',
+        'content_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../crypto/crypto.gyp:crypto',
@@ -28,4 +33,6 @@
           ],
         }],
       ],
+    },
+  ],
 }
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 03aa89f..d0d448a 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -3,8 +3,12 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'targets': [
+    {
+      'target_name': 'content_browser',
+      'type': 'static_library',
       'dependencies': [
+        'content_common',
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net',
         '../net/net.gyp:http_server',
@@ -625,4 +629,6 @@
           ],
         }],
       ],
+    },
+  ],
 }
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 9e091d8..2aa7cb7 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -3,7 +3,10 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'targets': [
+    {
+      'target_name': 'content_common',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../gpu/gpu.gyp:gpu_ipc',
@@ -321,4 +324,29 @@
           },
         }],
       ],
+    },
+  ],
+
+  'conditions': [
+    ['target_arch=="arm"', {
+      'targets': [
+        {
+          'target_name': 'omx_video_decode_accelerator_unittest',
+          'type': 'executable',
+          'dependencies': [
+            'content_common',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/angle/include',
+            '<(DEPTH)/third_party/openmax/il',
+          ],
+          'sources': [
+            'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
+          ],
+        }
+      ],
+    },
+   ],
+  ],
 }
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index 5d89a61..15fa0c8 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -3,8 +3,15 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'variables': {
+    'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
+  },  # variables
+  'targets': [
+    {
+      'target_name': 'content_gpu',
+      'type': 'static_library',
       'dependencies': [
+        'content_common',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../ui/gfx/gl/gl.gyp:gl',
@@ -85,4 +92,6 @@
           ],
         }],
       ],
+    },
+  ],
 }
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index 9ab27e1..f2f01bf 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -3,8 +3,12 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'targets': [
+    {
+      'target_name': 'content_plugin',
+      'type': 'static_library',
       'dependencies': [
+        'content_common',
         '../skia/skia.gyp:skia',
         '../third_party/npapi/npapi.gyp:npapi',
         '../webkit/support/webkit_support.gyp:glue',
@@ -60,4 +64,6 @@
           },
         }],
       ],
+    },
+  ],
 }
diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi
index 9efd3e1..dfa320a 100644
--- a/content/content_ppapi_plugin.gypi
+++ b/content/content_ppapi_plugin.gypi
@@ -3,7 +3,10 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'targets': [
+    {
+      'target_name': 'content_ppapi_plugin',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
@@ -34,4 +37,6 @@
           },
         }],
       ],
+    },
+  ],
 }
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 94c1617..bdfeb51 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -3,8 +3,12 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'targets': [
+    {
+      'target_name': 'content_renderer',
+      'type': 'static_library',
       'dependencies': [
+        'content_common',
         '../jingle/jingle.gyp:jingle_glue',
         '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
@@ -247,4 +251,6 @@
           ],
         }],
       ],
+    },
+  ],
 }
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index fb1f4e0..92c0bcb 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -172,26 +172,4 @@
       ],
     },
   ],
-  'conditions': [
-    ['target_arch=="arm"', {
-      'targets': [
-        {
-          'target_name': 'omx_video_decode_accelerator_unittest',
-          'type': 'executable',
-          'dependencies': [
-            'content',
-            '../testing/gtest.gyp:gtest',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/angle/include',
-            '<(DEPTH)/third_party/openmax/il',
-          ],
-          'sources': [
-            'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
-          ],
-        }
-      ],
-    },
-   ],
-  ],
 }
diff --git a/content/content_utility.gypi b/content/content_utility.gypi
index 0d2f700..f3f8c65 100644
--- a/content/content_utility.gypi
+++ b/content/content_utility.gypi
@@ -3,8 +3,12 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'targets': [
+    {
+      'target_name': 'content_utility',
+      'type': 'static_library',
       'dependencies': [
+        'content_common',
         '../base/base.gyp:base',
       ],
       'sources': [
@@ -25,4 +29,6 @@
           },
         }],
       ],
+    },
+  ],
 }
diff --git a/content/content_worker.gypi b/content/content_worker.gypi
index 48869df..7ac57fe 100644
--- a/content/content_worker.gypi
+++ b/content/content_worker.gypi
@@ -3,8 +3,12 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
+  'targets': [
+    {
+      'target_name': 'content_worker',
+      'type': 'static_library',
       'dependencies': [
+        'content_common',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -31,4 +35,6 @@
       'include_dirs': [
         '..',
       ],
+    },
+  ],
 }