linux: clean up include paths for local nss headers

build/linux/system.gyp

 # Copyright (c) 2011 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.
 
 {
   'conditions': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
@@ skipping 72 matching lines @@
               'dependencies': [
                 '../../third_party/openssl/openssl.gyp:openssl',
               ],
             }],
             ['use_openssl==0 and use_system_ssl==0', {
               'dependencies': [
                 '../../net/third_party/nss/ssl.gyp:ssl',
                 '../../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': [
-                  # We need for our local copies of the libssl3 headers to come
-                  # first, otherwise the code will build, but will fallback to
-                  # the set of features advertised in the system headers.
-                  # Unfortunately, there's no include path that we can filter
-                  # out of $(pkg-config --cflags nss) and GYP include paths
-                  # come after cflags on the command line. So we have these
-                  # bodges:
-                  '-Inet/third_party/nss/ssl',                         # for make
-                  '-ISource/WebKit/chromium/net/third_party/nss/ssl',  # for make in webkit
                   '<!@(<(pkg-config) --cflags nss)',
                 ],
               },
               'link_settings': {
                 'ldflags': [
                   '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
                 ],
                 'libraries': [
                   '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
                 ],
@@ skipping 369 matching lines @@
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcommon)',
             ],
           },
         }],
       ],
     },
   ],
 }