Bringing up the net target on iOS.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index f8de4ffc7297fc4c6466973ade3a7fb19111cd53..59c3451f62294251b5f7024e1f9dc8a5c35be127 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -8,8 +8,8 @@
 
     'linux_link_kerberos%': 0,
     'conditions': [
-      ['chromeos==1 or OS=="android"', {
-        # Disable Kerberos on ChromeOS and Android, at least for now.
+      ['chromeos==1 or OS=="android" or OS=="ios"', {
+        # Disable Kerberos on ChromeOS, Android and iOS, at least for now.
         # It needs configuration (krb5.conf and so on).
         'use_kerberos%': 0,
       }, {  # chromeos == 0
@@ -35,14 +35,10 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../crypto/crypto.gyp:crypto',
-        '../sdch/sdch.gyp:sdch',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/zlib/zlib.gyp:zlib',
-        '../v8/tools/gyp/v8.gyp:v8',
         'net_resources',
       ],
       'sources': [
@@ -805,6 +801,17 @@
         '../base/base.gyp:base',
       ],
       'conditions': [
+        # TODO(ios): This is temporary; currently almost nothing builds with
+        # OS=ios. Move dependencies back to the main dependencies section above
+        # as more is brought up for iOS.

[stuartmorgan, 2012/07/27 15:34:00]

Move this in, and put v8 above it.

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Done.

+        ['OS!="ios"', {

[stuartmorgan, 2012/07/27 15:34:00]

Spaces around !=

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Done.

+          'dependencies': [
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../crypto/crypto.gyp:crypto',
+            '../sdch/sdch.gyp:sdch',
+            '../v8/tools/gyp/v8.gyp:v8',
+          ],
+        }],
         ['chromeos==1', {
           'sources!': [
              'base/network_change_notifier_linux.cc',
@@ -1047,6 +1054,52 @@
             ],
           },
         ],
+        [ 'OS == "ios"', {
+            'link_settings': {
+              'libraries': [
+                '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
+                '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
+                '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',

[stuartmorgan, 2012/07/27 15:34:00]

Order

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Done.

+                '$(SDKROOT)/usr/lib/libresolv.dylib',
+              ],
+            },
+            'sources/': [
+              # Right now there is only a very limited subset of net compiled on
+              # iOS, just enough to bring up the dependencies needed by the ui
+              # target.

[stuartmorgan, 2012/07/27 15:34:00]

Make this a TODO so it's clearer.

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Done.

+              ['exclude', '.*'],
+              ['include', '^base/dns_util\\.cc$'],

[stuartmorgan, 2012/07/27 15:34:00]

Change these all to \\.*'

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Done.

+              ['include', '^base/dns_util\\.h$'],
+              ['include', '^base/escape\\.cc$'],
+              ['include', '^base/escape\\.h$'],
+              ['include', '^base/ip_endpoint\\.cc$'],
+              ['include', '^base/ip_endpoint\\.h$'],
+              ['include', '^base/mime_util\\.cc$'],
+              ['include', '^base/mime_util\\.h$'],
+              ['include', '^base/net_errors\\.cc$'],
+              ['include', '^base/net_errors\\.h$'],
+              ['include', '^base/net_errors_posix\\.cc$'],
+              ['include', '^base/net_export\\.h$'],
+              ['include', '^base/net_log\\.cc$'],
+              ['include', '^base/net_log\\.h$'],
+              ['include', '^base/net_module\\.cc$'],
+              ['include', '^base/net_module\\.h$'],
+              ['include', '^base/net_util\\.cc$'],
+              ['include', '^base/net_util\\.h$'],
+              ['include', '^base/net_util_posix\\.cc$'],
+              ['include', '^base/platform_mime_util\\.h$'],
+              ['include', '^base/registry_controlled_domains/registry_controlled_domain\\.h$'],
+              ['include', '^base/registry_controlled_domains/registry_controlled_domain\\.cc$'],
+              ['include', '^http/http_byte_range\\.h$'],
+              ['include', '^http/http_byte_range\\.cc$'],
+              ['include', '^http/http_content_disposition\\.h$'],
+              ['include', '^http/http_content_disposition\\.cc$'],
+              ['include', '^http/http_util\\.h$'],
+              ['include', '^http/http_util\\.cc$'],
+              ['include', '^http/http_version\\.h$'],
+            ],
+          },
+        ],
       ],
       'target_conditions': [
         ['OS == "android"', {
@@ -1054,6 +1107,11 @@
             ['include', '^base/platform_mime_util_linux\\.cc$'],
           ],
         }],
+        ['OS == "ios"', {
+          'sources/': [
+            ['include', 'base/platform_mime_util_mac\\.mm$'],
+          ],
+        }],
       ],
     },
     {
@@ -1066,7 +1124,6 @@
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

[stuartmorgan, 2012/07/27 15:34:00]

Remove this too.

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Done.

         '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../crypto/crypto.gyp:crypto',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
@@ -1307,6 +1364,12 @@
         'websockets/websocket_throttle_unittest.cc',
       ],
       'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../crypto/crypto.gyp:crypto',
+          ],
+        }],
         ['chromeos==1', {
           'sources!': [
             'base/network_change_notifier_linux_unittest.cc',
@@ -1329,7 +1392,7 @@
             ],
           },
         ],
-        [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
+        [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -1417,85 +1480,12 @@
           'sources!': [
             'base/x509_cert_types_unittest.cc',
           ],
-        }]
-      ],
-    },
-    {
-      'target_name': 'net_perftests',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        'net_test_support',
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../base/base.gyp:test_support_perf',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'cookies/cookie_monster_perftest.cc',
-        'disk_cache/disk_cache_perftest.cc',
-        'proxy/proxy_resolver_perftest.cc',
-      ],
-      'conditions': [
-        # This is needed to trigger the dll copy step on windows.
-        # TODO(mark): Specifying this here shouldn't be necessary.
-        [ 'OS == "win"', {
-            'dependencies': [
-              '../third_party/icu/icu.gyp:icudata',
-            ],
-          },
-        ],
-      ],
-    },
-    {
-      'target_name': 'stress_cache',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        'net_test_support',
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'disk_cache/stress_cache.cc',
-      ],
-    },
-    {
-      'target_name': 'tld_cleanup',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-      ],
-      'sources': [
-        'tools/tld_cleanup/tld_cleanup.cc',
-      ],
-    },
-    {
-      'target_name': 'crash_cache',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        'net_test_support',
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'tools/crash_cache/crash_cache.cc',
-      ],
-    },
-    {
-      'target_name': 'run_testserver',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        'net_test_support',
-        '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'tools/testserver/run_testserver.cc',
+        }],
+        ['OS == "ios"', {
+          'sources/': [
+            ['exclude', '.*'],

[stuartmorgan, 2012/07/27 15:34:00]

Put a TODO to make it obvious what's going on here.

If anything that we are building has unit tests that build, add them here.

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Added a TODO. In order for the tests to compile I had to remove net_test_support
and add a main simpler than the one in net/base.

+          ],
+        }],
       ],
     },
     {
@@ -1568,7 +1558,7 @@
         'url_request/url_request_test_util.h',
       ],
       'conditions': [
-        ['inside_chromium_build==1', {
+        ['inside_chromium_build==1 and OS != "ios"', {
           'dependencies': [
             '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
             # The test server uses Python modules generated by the sync protos.
@@ -1576,7 +1566,7 @@
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+        ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
@@ -1589,7 +1579,7 @@
             }],
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android"', {
+        ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -1626,56 +1616,6 @@
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'gdig',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        'net',
-      ],
-      'sources': [
-        'tools/gdig/file_net_log.cc',
-        'tools/gdig/gdig.cc',
-      ],
-    },
-    {
-      'target_name': 'fetch_client',
-      'type': 'executable',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        'net',
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'tools/fetch/fetch_client.cc',
-      ],
-    },
-    {
-      'target_name': 'fetch_server',
-      'type': 'executable',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        'net',
-        '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-      ],
-      'sources': [
-        'tools/fetch/fetch_server.cc',
-        'tools/fetch/http_listen_socket.cc',
-        'tools/fetch/http_listen_socket.h',
-        'tools/fetch/http_server.cc',
-        'tools/fetch/http_server.h',
-        'tools/fetch/http_server_request_info.cc',
-        'tools/fetch/http_server_request_info.h',
-        'tools/fetch/http_server_response_info.cc',
-        'tools/fetch/http_server_response_info.h',
-        'tools/fetch/http_session.cc',
-        'tools/fetch/http_session.h',
-      ],
-    },
-    {
       'target_name': 'http_server',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ -1694,52 +1634,195 @@
         'server/web_socket.h',
       ],
     },
-    {
-      'target_name': 'dnssec_chain_verify',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
-      ],
-    },
-    {
-      'target_name': 'crl_set_dump',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'tools/crl_set_dump/crl_set_dump.cc',
-      ],
-    },
-    {
-      'target_name': 'dns_fuzz_stub',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'tools/dns_fuzz_stub/dns_fuzz_stub.cc',
-      ],
-    },
-    {
-      'target_name': 'net_watcher',
-      'type': 'executable',
-      'dependencies': [
-        'net',
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'tools/net_watcher/net_watcher.cc',
-      ],
-    },
   ],
   'conditions': [
+    ['OS != "ios"', {
+      'targets': [
+        # iOS doesn't have the concept of simple executables, those targets can't
+        # be compiled on the platform.
+        {
+          'target_name': 'dnssec_chain_verify',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
+          ],
+        },
+        {
+          'target_name': 'fetch_server',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'net',
+            '../base/base.gyp:base',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
+          ],
+          'sources': [
+            'tools/fetch/fetch_server.cc',
+            'tools/fetch/http_listen_socket.cc',
+            'tools/fetch/http_listen_socket.h',
+            'tools/fetch/http_server.cc',
+            'tools/fetch/http_server.h',
+            'tools/fetch/http_server_request_info.cc',
+            'tools/fetch/http_server_request_info.h',
+            'tools/fetch/http_server_response_info.cc',
+            'tools/fetch/http_server_response_info.h',
+            'tools/fetch/http_session.cc',
+            'tools/fetch/http_session.h',
+          ],
+        },
+        {
+          'target_name': 'gdig',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'net',
+          ],
+          'sources': [
+            'tools/gdig/file_net_log.cc',
+            'tools/gdig/gdig.cc',
+          ],
+        },
+        {
+          'target_name': 'net_watcher',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'tools/net_watcher/net_watcher.cc',
+          ],
+        },
+        {
+          'target_name': 'crl_set_dump',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'tools/crl_set_dump/crl_set_dump.cc',
+          ],
+        },
+        {
+          'target_name': 'tld_cleanup',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
+          ],
+          'sources': [
+            'tools/tld_cleanup/tld_cleanup.cc',
+          ],
+        },
+        {
+          'target_name': 'dns_fuzz_stub',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'tools/dns_fuzz_stub/dns_fuzz_stub.cc',
+          ],
+        },
+
+        # TODO(ios): The target below could be compiled ont he platform, but
+        # the code allwing them to run is not yet there.

[stuartmorgan, 2012/07/27 15:34:00]

Typos (ont he, allwing)

Put this back but remove the code.

[noyau (Ping after 24h), 2012/07/27 17:24:53]

Done.

+        {
+          'target_name': 'net_perftests',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            'net_test_support',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../base/base.gyp:test_support_perf',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'cookies/cookie_monster_perftest.cc',
+            'disk_cache/disk_cache_perftest.cc',
+            'proxy/proxy_resolver_perftest.cc',
+          ],
+          'conditions': [
+            # This is needed to trigger the dll copy step on windows.
+            # TODO(mark): Specifying this here shouldn't be necessary.
+            [ 'OS == "win"', {
+                'dependencies': [
+                  '../third_party/icu/icu.gyp:icudata',
+                ],
+              },
+            ],
+            ['OS == "ios"', {
+              'sources!': [
+                # We do not support PAC scripts on iOS.
+                'proxy/proxy_resolver_perftest.cc',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'stress_cache',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            'net_test_support',
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'disk_cache/stress_cache.cc',
+          ],
+        },
+        {
+          'target_name': 'crash_cache',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            'net_test_support',
+            '../base/base.gyp:base',
+          ],
+          'sources': [
+            'tools/crash_cache/crash_cache.cc',
+          ],
+        },
+        {
+          'target_name': 'run_testserver',
+          'type': 'executable',
+          'dependencies': [
+            'net',
+            'net_test_support',
+            '../base/base.gyp:base',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'tools/testserver/run_testserver.cc',
+          ],
+        },
+        {
+          'target_name': 'fetch_client',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'net',
+            '../base/base.gyp:base',
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'tools/fetch/fetch_client.cc',
+          ],
+        },
+      ],
+    }],
     ['inside_chromium_build==1', {
       'targets': [
         # This target depends on dependencies not fetched by WebKit's DEPS.
@@ -1779,7 +1862,7 @@
         },
       ],
     }],
-    ['os_posix == 1 and OS != "mac" and OS != "android"', {
+    ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
       'targets': [
         {
           'target_name': 'flip_in_mem_edsm_server',