Applying late feedback on CL https://chromiumcodereview.appspot.com/10834051.

net/net.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 1013 matching lines @@
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
                 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
                 '$(SDKROOT)/usr/lib/libresolv.dylib',
               ]
             },
           },
         ],
-        [ 'OS == "android"', {
-            'defines': [
-              # Android can shut down our app at any time, so we persist session cookies.
-              'ENABLE_PERSISTENT_SESSION_COOKIES'
-            ],
-            'dependencies': [
-              '../third_party/openssl/openssl.gyp:openssl',
-              'net_jni_headers',
-            ],
-            'sources!': [
-              'base/openssl_memory_private_key_store.cc',
-            ],
-          }, {  # else OS! = "android"
-            'defines': [
-              # These are the features Android doesn't support.
-              'ENABLE_MEDIA_CODEC_THEORA',
-            ],
-          },
-        ],
-        [ 'OS == "linux"', {
-            'dependencies': [
-              '../build/linux/system.gyp:dbus',
-              '../dbus/dbus.gyp:dbus',
-            ],
-          },
-        ],
         [ 'OS == "ios"', {
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
                 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
                 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
                 '$(SDKROOT)/usr/lib/libresolv.dylib',
               ],
             },
             'sources/': [
@@ skipping 15 matching lines @@
               ['include', '^base/platform_mime_util\\.h$'],
               ['include', '^base/registry_controlled_domains/registry_controlled_domain\\.'],
               ['include', '^http/http_byte_range\\.'],
               ['include', '^http/http_content_disposition\\.'],
               ['include', '^http/http_util\\.'],
               ['include', '^http/http_util_icu\\.cc$'],
               ['include', '^http/http_version\\.h$'],
             ],
           },
         ],
+        [ 'OS == "android"', {
+            'defines': [
+              # Android can shut down the app at any time, so the cookies must
+              # be saved to permanent storage.
+              'ENABLE_PERSISTENT_SESSION_COOKIES'
+            ],
+            'dependencies': [
+              '../third_party/openssl/openssl.gyp:openssl',
+              'net_jni_headers',
+            ],
+            'sources!': [
+              'base/openssl_memory_private_key_store.cc',
+            ],
+          }, {  # else OS! = "android"
+            'defines': [
+              # These are the features Android doesn't support.
+              'ENABLE_MEDIA_CODEC_THEORA',
+            ],
+          },
+        ],
+        [ 'OS == "linux"', {
+            'dependencies': [
+              '../build/linux/system.gyp:dbus',
+              '../dbus/dbus.gyp:dbus',
+            ],
+          },
+        ],
       ],
       'target_conditions': [
         # These source files are excluded by default platform rules, but they
         # are needed in specific cases on other platforms. Re-including them can
         # only be done in target_conditions as it is evaluated after the
         # platform rules.
         ['OS == "android"', {
           'sources/': [
             ['include', '^base/platform_mime_util_linux\\.cc$'],
           ],
         }],
         ['OS == "ios"', {
           'sources/': [
             ['include', 'base/platform_mime_util_mac\\.mm$'],
           ],
         }],
       ],
     },
     {
       'target_name': 'net_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
-        'net',
-        'net_test_support',
         '../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',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
+        'net',
+        'net_test_support',
       ],
       'sources': [
         'base/address_list_unittest.cc',
         'base/address_tracker_linux_unittest.cc',
         'base/backoff_entry_unittest.cc',
         'base/big_endian_unittest.cc',
         'base/cert_database_nss_unittest.cc',
         'base/cert_verify_proc_unittest.cc',
         'base/crl_set_unittest.cc',
         'base/data_url_unittest.cc',
@@ skipping 305 matching lines @@
           },
         ],
         [ 'OS == "mac"', {
             'dependencies': [
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
             ],
           },
         ],
+        ['OS == "ios"', {
+          # TODO: For now this only tests the subset of code that is enabled in
+          # the net target.
+          'dependencies': [
+            '../testing/gtest.gyp:gtest_main',
+          ],
+          'dependencies!': [
+            'net_test_support',
+          ],
+          'sources/': [
+            ['exclude', '.*'],
+            ['include', '^base/dns_util_unittest\\.cc$'],
+            ['include', '^base/escape_unittest\\.cc$'],
+            ['include', '^base/ip_endpoint_unittest\\.cc$'],
+            ['include', '^base/mime_util_unittest\\.cc$'],
+            ['include', '^base/net_log_unittest\\.cc$'],
+            ['include', '^base/registry_controlled_domains/registry_controlled_domain_unittest\\.cc$'],
+            ['include', '^http/http_byte_range_unittest\\.cc$'],
+            ['include', '^http/http_content_disposition_unittest\\.cc$'],
+            ['include', '^http/http_util_unittest\\.cc$'],
+          ],
+        }],
         [ 'OS == "linux"', {
             'dependencies': [
               '../build/linux/system.gyp:dbus',
               '../dbus/dbus.gyp:dbus_test_support',
             ],
           },
         ],
         [ 'OS == "android"', {
             'defines': [
               # Android can shut down our app at any time, so we persist session cookies.
@@ skipping 10 matching lines @@
         ['OS == "android" and gtest_target_type == "shared_library"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ]
         }],
         [ 'OS != "win" and OS != "mac"', {
           'sources!': [
             'base/x509_cert_types_unittest.cc',
           ],
         }],
-        ['OS == "ios"', {
-          # TODO: For now this only tests the subset of code that is enabled in
-          # the net target.
-          'dependencies': [
-            '../testing/gtest.gyp:gtest_main',
-          ],
-          'dependencies!': [
-            'net_test_support',
-          ],
-          'sources/': [
-            ['exclude', '.*'],
-            ['include', '^base/dns_util_unittest\\.cc$'],
-            ['include', '^base/escape_unittest\\.cc$'],
-            ['include', '^base/ip_endpoint_unittest\\.cc$'],
-            ['include', '^base/mime_util_unittest\\.cc$'],
-            ['include', '^base/net_log_unittest\\.cc$'],
-            ['include', '^base/registry_controlled_domains/registry_controlled_domain_unittest\\.cc$'],
-            ['include', '^http/http_byte_range_unittest\\.cc$'],
-            ['include', '^http/http_content_disposition_unittest\\.cc$'],
-            ['include', '^http/http_util_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',
+        'net',
+        'net_test_support',
       ],
       '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"', {
@@ skipping 11 matching lines @@
             'cookies/cookie_monster_perftest.cc',
             'disk_cache/disk_cache_perftest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'net_test_support',
       'type': 'static_library',
       'dependencies': [
-        'net',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
+        'net',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'base/capturing_net_log.cc',
         'base/capturing_net_log.h',
         'base/cert_test_util.cc',
@@ skipping 104 matching lines @@
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       'target_name': 'http_server',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
+        '../base/base.gyp:base',
         'net',
-        '../base/base.gyp:base',
       ],
       'sources': [
         'server/http_connection.cc',
         'server/http_connection.h',
         'server/http_server.cc',
         'server/http_server.h',
         'server/http_server_request_info.cc',
         'server/http_server_request_info.h',
         'server/web_socket.cc',
         'server/web_socket.h',
       ],
     },
   ],
   'conditions': [
     ['OS != "ios"', {
       'targets': [
         # iOS doesn't have the concept of simple executables, these targets
         # can't be compiled on the platform.
         {
+          'target_name': 'crash_cache',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'net',
+            'net_test_support',
+          ],
+          'sources': [
+            'tools/crash_cache/crash_cache.cc',
+          ],
+        },
+        {
+          'target_name': 'crl_set_dump',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'net',
+          ],
+          'sources': [
+            'tools/crl_set_dump/crl_set_dump.cc',
+          ],
+        },
+        {
+          'target_name': 'dns_fuzz_stub',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'net',
+          ],
+          'sources': [
+            'tools/dns_fuzz_stub/dns_fuzz_stub.cc',
+          ],
+        },
+        {
           'target_name': 'dnssec_chain_verify',
           'type': 'executable',
           'dependencies': [
+            '../base/base.gyp:base',
             'net',
-            '../base/base.gyp:base',
           ],
           'sources': [
             'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
           ],
         },
         {
+          'target_name': 'fetch_client',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../testing/gtest.gyp:gtest',
+            'net',
+          ],
+          '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',
+            'net',
           ],
           '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',
@@ skipping 11 matching lines @@
           ],
           'sources': [
             'tools/gdig/file_net_log.cc',
             'tools/gdig/gdig.cc',
           ],
         },
         {
           'target_name': 'net_watcher',
           'type': 'executable',
           'dependencies': [
+            '../base/base.gyp:base',
             'net',
-            '../base/base.gyp:base',
           ],
           'sources': [
             'tools/net_watcher/net_watcher.cc',
           ],
         },
         {
-          'target_name': 'crl_set_dump',
+          'target_name': 'run_testserver',
           'type': 'executable',
           'dependencies': [
+            '../base/base.gyp:base',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../testing/gtest.gyp:gtest',
             'net',
-            '../base/base.gyp:base',
+            'net_test_support',
           ],
           'sources': [
-            'tools/crl_set_dump/crl_set_dump.cc',
+            'tools/testserver/run_testserver.cc',
+          ],
+        },
+        {
+          'target_name': 'stress_cache',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'net',
+            'net_test_support',
+          ],
+          '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': 'dns_fuzz_stub',
-          'type': 'executable',
-          'dependencies': [
-            'net',
-            '../base/base.gyp:base',
-          ],
-          'sources': [
-            'tools/dns_fuzz_stub/dns_fuzz_stub.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',
-          ],
-        },
       ],
     }],
     ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
       'targets': [
         {
           'target_name': 'flip_in_mem_edsm_server',
           'type': 'executable',
           'cflags': [
             '-Wno-deprecated',
           ],
           'dependencies': [
             '../base/base.gyp:base',
+            '../third_party/openssl/openssl.gyp:openssl',
             'net',
-            '../third_party/openssl/openssl.gyp:openssl',
           ],
           'sources': [
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
             'tools/dump_cache/url_utilities.cc',
 
             'tools/flip_server/acceptor_thread.h',
             'tools/flip_server/acceptor_thread.cc',
             'tools/flip_server/balsa_enums.h',
@@ skipping 76 matching lines @@
             'curvecp/server_messenger.h',
             'curvecp/server_packetizer.cc',
             'curvecp/server_packetizer.h',
           ],
         },
         {
           'target_name': 'curvecp_unittests',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
+            '../testing/gmock.gyp:gmock',
+            '../testing/gtest.gyp:gtest',
+            '../third_party/zlib/zlib.gyp:zlib',
             'curvecp',
             'net',
             'net_test_support',
-            '../testing/gmock.gyp:gmock',
-            '../testing/gtest.gyp:gtest',
-            '../third_party/zlib/zlib.gyp:zlib',
           ],
           'sources': [
             'curvecp/curvecp_transfer_unittest.cc',
             'curvecp/test_client.cc',
             'curvecp/test_server.cc',
           ],
         },
       ]
     }],
     ['OS=="android"', {
@@ skipping 50 matching lines @@
         },
       ],
     }],
     ['OS=="win"', {
       'targets': [
         {
           # TODO(port): dump_cache is still Windows-specific.
           'target_name': 'dump_cache',
           'type': 'executable',
           'dependencies': [
+            '../base/base.gyp:base',
             'net',
             'net_test_support',
-            '../base/base.gyp:base',
           ],
           'sources': [
             'tools/dump_cache/cache_dumper.cc',
             'tools/dump_cache/cache_dumper.h',
             'tools/dump_cache/dump_cache.cc',
             'tools/dump_cache/dump_files.cc',
             'tools/dump_cache/upgrade.cc',
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
@@ skipping 33 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }