Linux: untangle circular dependencies between .gyp files.

build/linux/system.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': {
     'conditions': [
       ['sysroot!=""', {
         'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
       }, {
@@ skipping 104 matching lines @@
             }],
           ],
         },
       ],  # targets
     }],
     ['linux_use_libgps==1', {
       'targets': [
         {
           'target_name': 'libgps',
           'type': 'static_library',
-          'dependencies': [
-            '../../base/base.gyp:base',
-          ],
           'all_dependent_settings': {
             'defines': [
               'USE_LIBGPS',
             ],
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)',
             ],
             'conditions': [
               ['linux_link_libgps==1', {
                 'cflags': [
                   '<!@(<(pkg-config) --cflags libgps)',
                 ],
                 'link_settings': {
                   'ldflags': [
                     '<!@(<(pkg-config) --libs-only-L --libs-only-other libgps)',
                   ],
                   'libraries': [
                     '<!@(<(pkg-config) --libs-only-l libgps)',
                   ],
                 }
               }],
             ],
           },
+          'include_dirs': [
+            '../..',
+          ],
           'hard_dependency': 1,
           'actions': [
             {
               'variables': {
                 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libgps.h',
                 'output_cc': '<(INTERMEDIATE_DIR)/libgps_loader.cc',
                 'generator': '../../tools/generate_library_loader/generate_library_loader.py',
               },
               'action_name': 'generate_libgps_loader',
               'inputs': [
@@ skipping 34 matching lines @@
         ['_toolset=="target"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
                 '../../third_party/openssl/openssl.gyp:openssl',
               ],
             }],
             ['use_openssl==0 and use_system_ssl==0', {
               'dependencies': [
                 '../../net/third_party/nss/ssl.gyp:libssl',
-                '../../third_party/zlib/zlib.gyp:zlib',
               ],
               'direct_dependent_settings': {
                 'include_dirs+': [
                   # We need for our local copies of the libssl3 headers to come
                   # before other includes, as we are shadowing system headers.
                   '<(DEPTH)/net/third_party/nss/ssl',
                 ],
                 'cflags': [
                   '<!@(<(pkg-config) --cflags nss)',
                 ],
@@ skipping 102 matching lines @@
             ],
           },
         }],
       ],
     },
     {
       'target_name': 'gio',
       'type': 'static_library',
       'conditions': [
         ['use_gio==1 and _toolset=="target"', {
-          'dependencies': [
-            '../../base/base.gyp:base',
-          ],
           'cflags': [
             '<!@(<(pkg-config) --cflags gio-2.0)',
           ],
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gio-2.0)',
             ],
             'defines': [
               'USE_GIO',
             ],
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
+          'include_dirs': [
+            '../..',
+          ],
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-L --libs-only-other gio-2.0)',
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l gio-2.0)',
             ],
             'conditions': [
               ['linux_link_gsettings==0 and OS=="linux"', {
                 'libraries': [
@@ skipping 39 matching lines @@
           ],
         }],
       ],
     },
     {
       'target_name': 'libpci',
       'type': 'static_library',
       'cflags': [
         '<!@(<(pkg-config) --cflags libpci)',
       ],
-      'dependencies': [
-        '../../base/base.gyp:base',
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)',
         ],
         'conditions': [
           ['linux_link_libpci==1', {
             'link_settings': {
               'ldflags': [
                 '<!@(<(pkg-config) --libs-only-L --libs-only-other libpci)',
               ],
               'libraries': [
                 '<!@(<(pkg-config) --libs-only-l libpci)',
               ],
             }
           }],
         ],
       },
+      'include_dirs': [
+        '../..',
+      ],
       'hard_dependency': 1,
       'actions': [
         {
           'variables': {
             'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libpci.h',
             'output_cc': '<(INTERMEDIATE_DIR)/libpci_loader.cc',
             'generator': '../../tools/generate_library_loader/generate_library_loader.py',
           },
           'action_name': 'generate_libpci_loader',
           'inputs': [
@@ skipping 21 matching lines @@
                      'pci_lookup_name',
           ],
           'message': 'Generating libpci library loader.',
           'process_outputs_as_sources': 1,
         },
       ],
     },
     {
       'target_name': 'libspeechd',
       'type': 'static_library',
-      'dependencies': [
-        '../../base/base.gyp:base',
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)',
         ],
         'conditions': [
           ['linux_link_libspeechd==1', {
             'link_settings': {
               'libraries': [
                 '-lspeechd',
               ],
             }
           }],
         ],
       },
+      'include_dirs': [
+        '../..',
+      ],
       'hard_dependency': 1,
       'actions': [
         {
           'variables': {
             'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libspeechd.h',
             'output_cc': '<(INTERMEDIATE_DIR)/libspeechd_loader.cc',
             'generator': '../../tools/generate_library_loader/generate_library_loader.py',
 
             # speech-dispatcher >= 0.8 installs libspeechd.h into
             # speech-dispatcher/libspeechd.h, whereas speech-dispatcher < 0.8
@@ skipping 341 matching lines @@
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l libudev)',
             ],
           },
         }],
       ],
     },
   ],
 }