linux: clean up include paths for local nss headers

build/linux/system.gyp

Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index e87e1a7e33a52f99f0189bf3894bbebf19951309..2221c01d9c90f8044e93d3a2f7ef4672b12d6779 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -90,16 +90,12 @@
                 '../../third_party/zlib/zlib.gyp:zlib',
               ],
               'direct_dependent_settings': {
-                'cflags': [
+                'include_dirs+': [
                   # 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
+                  # before other includes, as we are shadowing system headers.
+                  '<(DEPTH)/net/third_party/nss/ssl',
+                ],
+                'cflags': [
                   '<!@(<(pkg-config) --cflags nss)',
                 ],
               },