From 736b27cc72a34a4e0907a952eb1d0f04057fb513 Mon Sep 17 00:00:00 2001
From: "blundell@chromium.org"
 <blundell@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Wed, 4 Dec 2013 19:50:37 +0000
Subject: [PATCH] Build components.gyp:* and components_test.gyp:* on iOS.

These targets are now built as part of the All build on iOS.

BUG=324837,324839

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@238737 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 all.gyp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/all.gyp b/all.gyp
index edb2e867d..5aaed3d0f 100644
--- a/all.gyp
+++ b/all.gyp
@@ -12,6 +12,8 @@
         'some.gyp:*',
         '../base/base.gyp:*',
         '../chrome/chrome.gyp:*',
+        '../components/components.gyp:*',
+        '../components/components_tests.gyp:*',
         '../content/content.gyp:*',
         '../content/content_shell_and_tests.gyp:*',
         '../crypto/crypto.gyp:*',
@@ -34,8 +36,6 @@
         ['OS!="ios"', {
           'dependencies': [
             '../cc/cc_tests.gyp:*',
-            '../components/components.gyp:*',
-            '../components/components_tests.gyp:*',
             '../device/bluetooth/bluetooth.gyp:*',
             '../device/device_tests.gyp:*',
             '../device/usb/usb.gyp:*',
@@ -226,9 +226,11 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_unittests',
+        '../components/components_tests.gyp:components_unittests',
         '../crypto/crypto.gyp:crypto_unittests',
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
+        '../sync/sync.gyp:sync_unit_tests',
         '../ui/ui_unittests.gyp:ui_unittests',
         '../url/url.gyp:url_unittests',
       ],
@@ -245,7 +247,6 @@
             '../chrome/chrome.gyp:sync_integration_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
-            '../components/components_tests.gyp:components_unittests',
             '../content/content_shell_and_tests.gyp:content_browsertests',
             '../content/content_shell_and_tests.gyp:content_shell',
             '../content/content_shell_and_tests.gyp:content_unittests',
@@ -260,7 +261,6 @@
             '../mojo/mojo.gyp:mojo',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
-            '../sync/sync.gyp:sync_unit_tests',
             '../third_party/WebKit/public/all.gyp:all_blink',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',