commit 047d132d6c201b9dacbd1459516a161d454b44dc
author sdefresne <sdefresne@chromium.org> Thu Feb 04 18:10:50 2016
committer Commit bot <commit-bot@chromium.org> Thu Feb 04 18:11:51 2016
tree b2c66924172de6b0e72adeccd4a27b471fe893b0
parent d3d8cfdb47fe445ae23f6eafc90f977e6f50a8b9

Stop building components depending on content/ on iOS.

Chrome on iOS cannot use content/ so remove from the compilation
all components that depend on content.

Remove dependencies on chrome/chrome.gyp and content/content.gyp
from build/all.gyp on iOS and add another mojo target that should
be built on iOS.

BUG=None

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

Cr-Commit-Position: refs/heads/master@{#373564}

components/content_settings.gypi

diff --git a/components/content_settings.gypi b/components/content_settings.gypi
index c547bad..1d9b3176 100644
--- a/components/content_settings.gypi
+++ b/components/content_settings.gypi
@@ -117,26 +117,32 @@
         'content_settings/core/test/content_settings_test_utils.h',
       ],
     },
-    {
-      # GN version: //components/content_settings/content/common
-      'target_name': 'content_settings_content_common',
-      'type': 'static_library',
-      'dependencies': [
-        'content_settings_core_common',
-        '../base/base.gyp:base',
-        '../content/content.gyp:content_common',
-        '../ipc/ipc.gyp:ipc',
-        '../url/url.gyp:url_lib',
+  ],
+  'conditions': [
+    ['OS!="ios"', {
+      'targets': [
+        {
+          # GN version: //components/content_settings/content/common
+          'target_name': 'content_settings_content_common',
+          'type': 'static_library',
+          'dependencies': [
+            'content_settings_core_common',
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_common',
+            '../ipc/ipc.gyp:ipc',
+            '../url/url.gyp:url_lib',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            # Note: sources list duplicated in GN build.
+            'content_settings/content/common/content_settings_message_generator.cc',
+            'content_settings/content/common/content_settings_message_generator.h',
+            'content_settings/content/common/content_settings_messages.h',
+          ],
+        },
       ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        # Note: sources list duplicated in GN build.
-        'content_settings/content/common/content_settings_message_generator.cc',
-        'content_settings/content/common/content_settings_message_generator.h',
-        'content_settings/content/common/content_settings_messages.h',
-      ],
-    },
+    }]
   ],
 }