Bug 937224 - Part g: Move LOCAL_INCLUDES to moz.build in netwerk/; r=mshal

2024-09-13 09:24:08 -07:00 · 2013-11-28 15:25:39 +01:00 · 2013-11-28 15:25:39 +01:00 · cbe8d3a7a4
commit cbe8d3a7a4
parent 9eec9d6f49
46 changed files with 187 additions and 257 deletions
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -1,46 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../base/src \
-  -I$(srcdir)/../dns \
-  -I$(srcdir)/../socket \
-  -I$(srcdir)/../streamconv/src \
-  -I$(srcdir)/../streamconv/converters \
-  -I$(srcdir)/../mime \
-  -I$(srcdir)/../cache \
-  -I$(srcdir)/../protocol/about \
-  -I$(srcdir)/../protocol/app \
-  -I../dns \
-  $(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
-    -I$(srcdir)/../protocol/$(d)) \
-  $(NULL)
-
-ifeq ($(OS_ARCH),WINNT)
-    LOCAL_INCLUDES += -I$(srcdir)/../system/win32
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-    LOCAL_INCLUDES += -I$(srcdir)/../system/mac
-endif
-
-ifdef MOZ_ENABLE_QTNETWORK
-    LOCAL_INCLUDES += -I$(srcdir)/../system/qt
-endif
-
-ifeq (android,$(MOZ_WIDGET_TOOLKIT))
-    LOCAL_INCLUDES += -I$(srcdir)/../system/android
-endif
-
-ifdef NECKO_COOKIES
-LOCAL_INCLUDES += -I$(srcdir)/../cookie
-endif
-
-ifdef NECKO_WIFI
-LOCAL_INCLUDES += -I$(srcdir)/../wifi
-
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@ -21,3 +21,60 @@ LIBRARY_NAME = 'necko'
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../base/src',
+    '../cache',
+    '../dns',
+    '../mime',
+    '../protocol/about',
+    '../protocol/app',
+    '../socket',
+    '../streamconv/converters',
+    '../streamconv/src',
+]
+
+protocols = CONFIG['NECKO_PROTOCOLS'].copy()
+protocols.remove("about")
+LOCAL_INCLUDES += sorted([
+    '../protocol/%s' % d for d in protocols
+])
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    LOCAL_INCLUDES += [
+        '../system/win32',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    LOCAL_INCLUDES += [
+        '../system/mac',
+    ]
+
+if CONFIG['MOZ_ENABLE_QTNETWORK']:
+    LOCAL_INCLUDES += [
+        '../system/qt',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    LOCAL_INCLUDES += [
+        '../system/android',
+    ]
+
+if CONFIG['NECKO_COOKIES']:
+    LOCAL_INCLUDES += [
+        '../cookie',
+    ]
+
+if CONFIG['NECKO_WIFI']:
+    LOCAL_INCLUDES += [
+        '../wifi',
+    ]
+
+if CONFIG['MOZ_RTSP']:
+    LOCAL_INCLUDES += [
+        '../protocol/rtsp',
+    ]
+
+GENERATED_INCLUDES += [
+    '../dns',
+]
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../base/src \
-  $(NULL)
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@ -45,3 +45,7 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../base/src',
+]
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifdef NECKO_COOKIES
-
-LOCAL_INCLUDES	= \
-		-I$(topsrcdir)/intl/uconv/src \
-		$(NULL)
-
-endif
-
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@ -29,13 +29,15 @@ if CONFIG['NECKO_COOKIES']:
        'nsCookie.cpp',
        'nsCookieService.cpp',
    ]
+    LOCAL_INCLUDES += [
+        '/intl/uconv/src',
+    ]

-if CONFIG['NECKO_COOKIES']:
    XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

-# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
-if CONFIG['NECKO_COOKIES'] and CONFIG['OS_ARCH'] != 'Darwin':
-    XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']
+    # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+    if CONFIG['OS_ARCH'] != 'Darwin':
+        XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']

 IPDL_SOURCES = [
    'PCookieService.ipdl',
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@ -3,12 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-# need to include etld_data.inc
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../base/src \
-  -I. \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

 # Generate the include file containing compact, static definitions
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@ -42,3 +42,8 @@ FINAL_LIBRARY = 'necko'
 GENERATED_FILES = [
    'etld_data.inc',
 ]
+
+# need to include etld_data.inc
+LOCAL_INCLUDES += [
+    '../base/src',
+]
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES +=                  \
-  -I$(srcdir)/../protocol/http \
-  -I$(srcdir)/../base/src          \
-  -I$(topsrcdir)/modules/libjar    \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@ -41,3 +41,9 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../base/src',
+    '../protocol/http',
+    '/modules/libjar',
+]
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@ -1,10 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@ -27,3 +27,7 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../../base/src',
+]
--- a/netwerk/protocol/app/Makefile.in
+++ b/netwerk/protocol/app/Makefile.in
@ -1,9 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  -I$(srcdir)/../../../modules/libjar \
-  $(NULL)
--- a/netwerk/protocol/app/moz.build
+++ b/netwerk/protocol/app/moz.build
@ -11,3 +11,8 @@ SOURCES += [
 FAIL_ON_WARNINGS = True

 FINAL_LIBRARY = 'necko'
+LOCAL_INCLUDES += [
+    '../../../modules/libjar',
+    '../../base/src',
+]
+
--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  $(NULL)
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@ -12,3 +12,7 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True

 FINAL_LIBRARY = 'necko'
+LOCAL_INCLUDES += [
+    '../../base/src',
+]
+
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
-                 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@ -23,3 +23,7 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../../base/src/',
+]
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@ -1,9 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  -I$(topsrcdir)/xpcom/ds \
-  $(NULL)
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@ -21,3 +21,8 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../../base/src',
+    '/xpcom/ds',
+]
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@ -1,11 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  -I$(topsrcdir)/xpcom/ds \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@ -39,3 +39,8 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../../base/src',
+    '/xpcom/ds',
+]
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@ -1,13 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  -I$(topsrcdir)/xpcom/ds \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/content/events/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@ -102,3 +102,10 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../../base/src',
+    '/content/base/src',
+    '/content/events/src',
+    '/xpcom/ds',
+]
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@ -1,10 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/netwerk/base/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@ -21,3 +21,7 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '/netwerk/base/src',
+]
--- a/netwerk/protocol/rtsp/Makefile.in
+++ b/netwerk/protocol/rtsp/Makefile.in
@ -2,30 +2,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/xpcom/ds \
-  -I$(srcdir) \
-  -I$(srcdir)/rtsp \
-  -I$(srcdir)/controller \
-  $(NULL)
-
-ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),15))
-LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/mpeg2ts \
-                  $(NULL)
-else
-LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/frameworks/av/media/libstagefright/mpeg2ts \
-                  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

-DEFINES += -Wno-multichar
+ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),15))
+CXXFLAGS += \
+  -I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/mpeg2ts \
+  $(NULL)
+else
+CXXFLAGS += \
+  -I$(ANDROID_SOURCE)/frameworks/av/media/libstagefright/mpeg2ts \
+  $(NULL)
+endif
+
+CXXFLAGS += \
+  -Wno-multichar \
+  $(NULL)
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@ -51,5 +51,17 @@ include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'

+DEFINES['IMPL_NS_NET'] = True
+DEFINES['FORCE_PR_LOG'] = True
+
+LOCAL_INCLUDES += [
+    '../../base/src',
+    '/content/base/src',
+    '/content/events/src',
+    '/xpcom/ds',
+    'controller',
+    'rtsp',
+]
+
 for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'):
    DEFINES[var] = True
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  $(NULL)
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@ -18,3 +18,7 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True

 FINAL_LIBRARY = 'necko'
+LOCAL_INCLUDES += [
+    '../../base/src',
+]
+
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/xpcom/ds \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@ -38,3 +38,10 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../../base/src',
+    '/content/base/src',
+    '/content/events/src',
+    '/xpcom/ds',
+]
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@ -34,3 +34,7 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '../../base/src',
+]
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@ -4,10 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/xpcom/ds \
-  -I$(srcdir)/../src \
-  -I$(DEPTH)/dist/include/mozilla/net \
-  -I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source \
-  -I$(topsrcdir)/media/mtransport \
-  $(NULL)
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@ -22,6 +22,13 @@ include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'

+LOCAL_INCLUDES += [
+    '../src',
+    '/media/mtransport',
+    '/media/webrtc/trunk/third_party/libjingle/source',
+    '/xpcom/ds',
+]
+
 DEFINES['INET'] = 1
 DEFINES['SCTP_DEBUG'] = 1

--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@ -11,13 +11,6 @@ VPATH     = \

 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO

-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../base/src \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/xpcom/ds \
-  $(NULL)
-
 ifeq ($(OS_TARGET),Darwin)
 DEFINES += \
  -U__APPLE__ \
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@ -49,6 +49,13 @@ include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'

+LOCAL_INCLUDES += [
+    '../../base/src',
+    '/content/base/src',
+    '/content/events/src',
+    '/xpcom/ds',
+]
+
 for var in ('SCTP_SIMPLE_ALLOCATOR', 'USE_SCTP_SHA1',
            'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET',
            'CALLBACK_API', 'SCTP_DEBUG'):
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@ -15,11 +15,6 @@ VPATH = \
  @srcdir@/crypto/rng \
  $(NULL)

-LOCAL_INCLUDES = \
-  -I$(srcdir)/include \
-  -I$(srcdir)/crypto/include \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

 ifdef GNU_CC
--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@ -39,6 +39,11 @@ include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'necko'

+LOCAL_INCLUDES += [
+    'crypto/include',
+    'include',
+]
+
 # We know stdint.h will define uint8/16/32/64_t, so we don't need
 # to define SIZEOF_UNSIGNED_LONG/SIZEOF_UNSIGNED_LONG_LONG
 for var in ('HAVE_STDLIB_H', 'HAVE_UINT8_T', 'HAVE_UINT16_T',
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES =                        \
-        -I$(topsrcdir)/netwerk/base/src \
-        $(NULL)
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@ -31,3 +31,7 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True

 FINAL_LIBRARY = 'necko'
+
+LOCAL_INCLUDES += [
+    '/netwerk/base/src',
+]
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES += -I$(srcdir)/../../base/src
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@ -11,3 +11,7 @@ SOURCES += [
 FAIL_ON_WARNINGS = True

 FINAL_LIBRARY = 'necko'
+LOCAL_INCLUDES += [
+    '../../base/src',
+]
+
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@ -6,4 +6,3 @@
 include $(topsrcdir)/config/rules.mk

 OS_INCLUDES += $(MOZ_QT_CFLAGS)
-LOCAL_INCLUDES += -I$(srcdir)/../../base/src
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@ -16,3 +16,7 @@ GENERATED_SOURCES += [
 FAIL_ON_WARNINGS = True

 FINAL_LIBRARY = 'necko'
+LOCAL_INCLUDES += [
+    '../../base/src',
+]
+