Add preliminary iOS support to more content/ gypi files

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index c86afd7653b8f0a99fab41ae92fa2e3a64ce4865..63e4f815af080794bd3bc589c36e02f50cff86a8 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -6,24 +6,11 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../build/temp_gyp/googleurl.gyp:googleurl',
-    '../gpu/gpu.gyp:gles2_implementation',
-    '../gpu/gpu.gyp:gpu_ipc',
-    '../ipc/ipc.gyp:ipc',
     '../media/media.gyp:media',
-    '../media/media.gyp:shared_memory_support',
     '../net/net.gyp:net',
-    '../ppapi/ppapi_internal.gyp:ppapi_shared',
     '../skia/skia.gyp:skia',
     '../third_party/icu/icu.gyp:icuuc',
-    '../third_party/npapi/npapi.gyp:npapi',
-    '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-    '../ui/gl/gl.gyp:gl',
     '../ui/ui.gyp:ui',
-    '../webkit/support/webkit_support.gyp:appcache',
-    '../webkit/support/webkit_support.gyp:blob',
-    '../webkit/support/webkit_support.gyp:database',
-    '../webkit/support/webkit_support.gyp:fileapi',
-    '../webkit/support/webkit_support.gyp:webkit_base',
   ],
   'include_dirs': [
     '..',
@@ -384,6 +371,23 @@
     'public/common/webkit_param_traits.h',
   ],
   'conditions': [
+    ['OS!="ios"', {
+      'dependencies': [
+        '../gpu/gpu.gyp:gles2_implementation',
+        '../gpu/gpu.gyp:gpu_ipc',
+        '../ipc/ipc.gyp:ipc',
+        '../media/media.gyp:shared_memory_support',
+        '../ppapi/ppapi_internal.gyp:ppapi_shared',
+        '../third_party/npapi/npapi.gyp:npapi',
+        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '../ui/gl/gl.gyp:gl',
+        '../webkit/support/webkit_support.gyp:appcache',
+        '../webkit/support/webkit_support.gyp:blob',
+        '../webkit/support/webkit_support.gyp:database',
+        '../webkit/support/webkit_support.gyp:fileapi',
+        '../webkit/support/webkit_support.gyp:webkit_base',
+      ],
+    }],
     ['OS!="win"', {
       'sources!': [
         'common/sandbox_policy.cc',
@@ -524,6 +528,25 @@
         ],
       },
      ]
-    }]
+    }],
+    ['OS=="ios"', {

[jam, 2012/09/07 16:25:52]

move this to 374 and combine

[stuartmorgan, 2012/09/07 17:03:41]

FWIW, I separated them on purpose. Almost everywhere Android did the
combination, it made things harder to find, and in several cases I had to break
things apart. I like making the "dependencies that everyone that iOS" uses as
prominent as possible in the file, so they are easy to find, and the unusual iOS
stuff at the end of the target, since it's least relevant to most people in the
file.

I can recombine them if you feel strongly it's better that way, but I definitely
find this more readable.

[jam, 2012/09/10 05:46:07]

+mmentovai: do we have a convention for this sort of thing? if not, what do you
prefer?

[Mark Mentovai, 2012/09/10 12:54:41]

John Abd-El-Malek wrote:
Combine ’em. No sense in duplicating the same condition. This file already mixes
dependencies with other properties.

+      'sources/': [
+        # 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', '^public/common/content_constants\\.cc$'],
+        ['include', '^public/common/content_switches\\.cc$'],
+        ['include', '^public/common/frame_navigate_params\\.cc$'],
+        ['include', '^public/common/page_transition_types\\.cc$'],
+        ['include', '^public/common/speech_recognition_result\\.cc$'],
+        ['include', '^public/common/url_constants\\.cc$'],
+        ['include', '^common/content_paths\\.cc$'],
+        ['include', '^common/net/url_fetcher\\.cc$'],
+        ['include', '^common/net/url_request_user_data\\.cc$'],
+        ['include', '^common/savable_url_schemes\\.cc$'],
+        ['include', '^common/url_schemes\\.cc$'],
+      ],
+    }],
   ],
 }