Add preliminary iOS support to more content/ gypi files

Restructures content_app.gypi, content_common.gypi, and content_tests.gypi slightly to support building them for iOS. One target, content_browsertests, is excluded entirely for iOS. More files will be added to the iOS build later, once the content/ build is working for iOS. BUG=None Review URL: https://chromiumcodereview.appspot.com/10917130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155759 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Sep 10, 2012 · aeaaaf0 · aeaaaf0
1 parent 91ff1df
commit aeaaaf0
Show file tree

Hide file tree

Showing 5 changed files with 277 additions and 211 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -469,6 +469,7 @@
 
         ['OS=="ios"', {
           'enable_automation%': 0,
+          'enable_webrtc%': 0,
           'disable_ftp_support%': 1,
           'remoting%': 0,
         }],
@@ -918,6 +919,7 @@
       }],  # os_posix==1 and OS!="mac" and OS!="ios"
       ['OS=="ios"', {
         'disable_nacl%': 1,
+        'enable_gpu%': 0,
         'icu_use_data_file_flag%': 1,
         'use_system_bzip2%': 1,
         'use_system_libxml%': 1,

diff --git a/content/content_app.gypi b/content/content_app.gypi
@@ -48,5 +48,10 @@
         '../skia/skia.gyp:skia',
       ],
     }],
+    ['OS=="ios"', {
+      'sources!': [
+        'app/content_main.cc',
+      ],
+    }],
   ],
 }
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
@@ -833,7 +833,21 @@
         'browser/gamepad/gamepad_platform_data_fetcher.cc',
       ]
     }],
-    ['OS!="ios"', {
+    ['OS=="ios"', {
+      'sources/': [
+        # iOS only needs a small portion of content; exclude all the
+        # implementation, and re-include what is used.
+        ['exclude', '\\.cc$'],
+        ['exclude', '\\.mm$'],
+        ['include', '_ios\\.(cc|mm)$'],
+        ['include', '^public/browser/notification_registrar\\.cc$'],
+        ['include', '^public/browser/speech_recognition_'],
+        ['include', '^browser/notification_service_impl\\.cc$'],
+        # Pull in all but one file from speech.
+        ['include', '^browser/speech/'],
+        ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.cc$$'],
+      ],
+    }, {  # OS!="ios"
       'dependencies': [
         'browser/debugger/devtools_resources.gyp:devtools_resources',
         '../net/net.gyp:http_server',
@@ -1032,20 +1046,5 @@
         ['exclude', '^browser/speech/'],
       ],
     }],
-    ['OS=="ios"', {
-      'sources/': [
-        # iOS only needs a small portion of content; exclude all the
-        # implementation, and re-include what is used.
-        ['exclude', '\\.cc$'],
-        ['exclude', '\\.mm$'],
-        ['include', '_ios\\.(cc|mm)$'],
-        ['include', '^public/browser/notification_registrar\\.cc$'],
-        ['include', '^public/browser/speech_recognition_'],
-        ['include', '^browser/notification_service_impl\\.cc$'],
-        # Pull in all but one file from speech.
-        ['include', '^browser/speech/'],
-        ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.cc$$'],
-      ],
-    }],
   ],
 }
diff --git a/content/content_common.gypi b/content/content_common.gypi
@@ -6,26 +6,13 @@
   '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:forms',
     '../webkit/support/webkit_support.gyp:user_agent',
-    '../webkit/support/webkit_support.gyp:webkit_base',
   ],
   'include_dirs': [
     '..',
@@ -388,6 +375,41 @@
     'public/common/webkit_param_traits.h',
   ],
   'conditions': [
+    ['OS=="ios"', {
+      '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$'],
+      ],
+    }, {  # 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',
@@ -528,6 +550,6 @@
         ],
       },
      ]
-    }]
+    }],
   ],
 }