Bug 928709 - Convert chromium-config.mk to mozbuild, r=mshal

accessible/src/windows/msaa/Makefile.in

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifneq ($(A11Y_LOG),0)
   DEFINES += -DA11Y_LOG

accessible/src/windows/msaa/moz.build

@@ -61,3 +61,5 @@ LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

chrome/src/Makefile.in

@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/protocol/res \

chrome/src/moz.build

@@ -23,3 +23,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'chrome_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/base/src/Makefile.in

@@ -10,7 +10,6 @@ LOCAL_INCLUDES += \
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/caps/include \

content/base/src/moz.build

@@ -182,3 +182,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconbase_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/canvas/src/Makefile.in

@@ -10,7 +10,6 @@ LOCAL_INCLUDES += \
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
 

content/canvas/src/moz.build

@@ -85,3 +85,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconcvs_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/events/src/Makefile.in

@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES	+= \
              -I$(srcdir)/../../base/src \

content/events/src/moz.build

@@ -75,3 +75,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconevents_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/html/content/src/Makefile.in

@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../document/src \

content/html/content/src/moz.build

@@ -164,3 +164,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconhtmlcon_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/mathml/content/src/Makefile.in

@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES += \
   -I$(srcdir)/../../../base/src \

content/mathml/content/src/moz.build

@@ -17,3 +17,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkcontentmathml_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/Makefile.in

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef MOZ_OMX_DECODER
 DEFINES += -DMOZ_OMX_DECODER

content/media/moz.build

@@ -159,3 +159,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconmedia_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/omx/Makefile.in

@@ -3,7 +3,6 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
  		-I$(srcdir)/mediaresourcemanager \

content/media/omx/mediaresourcemanager/Makefile.in

@@ -5,7 +5,6 @@
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 	        -I$(srcdir)/ \

content/media/omx/mediaresourcemanager/moz.build

@@ -16,3 +16,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'mediaresourcemanager'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/omx/moz.build

@@ -32,3 +32,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconomx_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/webaudio/Makefile.in

@@ -1,6 +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
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

content/media/webaudio/blink/Makefile.in

@@ -5,4 +5,3 @@
 LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

content/media/webaudio/blink/moz.build

@@ -30,3 +30,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebaudio_blink_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/webaudio/moz.build

@@ -90,3 +90,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebaudio_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/webrtc/Makefile.in

@@ -7,7 +7,6 @@ OS_CXXFLAGS += -DNOMINMAX
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \

content/media/webrtc/moz.build

@@ -33,3 +33,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebrtc_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/webspeech/recognition/Makefile.in

@@ -4,4 +4,3 @@
 
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

content/media/webspeech/recognition/moz.build

@@ -44,3 +44,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebspeechrecognition_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/webspeech/synth/Makefile.in

@@ -11,4 +11,3 @@ VPATH += \
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

content/media/webspeech/synth/moz.build

@@ -54,3 +54,5 @@ LIBRARY_NAME = 'gkconwebspeechsynth_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/media/webspeech/synth/pico/Makefile.in

@@ -6,4 +6,3 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

content/media/webspeech/synth/pico/moz.build

@@ -15,3 +15,5 @@ LIBRARY_NAME = 'synthpico'
 LIBXUL_LIBRARY = True
 EXPORT_LIBRARY = True
 FAIL_ON_WARNINGS = True
+include('/ipc/chromium/chromium-config.mozbuild')
+

content/svg/content/src/Makefile.in

@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES += 	\
 		-I$(srcdir)/../../../xml/content/src \

content/svg/content/src/moz.build

@@ -251,3 +251,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkcontentsvg_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

docshell/base/Makefile.in

@@ -8,7 +8,6 @@ DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir)/../shistory/src \

docshell/base/moz.build

@@ -70,3 +70,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'basedocshell_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/alarm/Makefile.in

@@ -6,4 +6,3 @@ include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/alarm/moz.build

@@ -39,3 +39,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domalarm_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/audiochannel/Makefile.in

@@ -1,16 +0,0 @@
-# Copyright 2012 Mozilla Foundation and Mozilla contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/audiochannel/moz.build

@@ -35,3 +35,5 @@ LIBRARY_NAME = 'domaudiochannel_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/base/Makefile.in

@@ -17,7 +17,6 @@ DEFINES += -DMOZ_B2G_FM
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/js/xpconnect/src \

dom/base/moz.build

@@ -125,3 +125,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'jsdombase_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/battery/Makefile.in

@@ -9,4 +9,3 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/battery/moz.build

@@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_battery_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/bindings/Makefile.in

@@ -119,7 +119,6 @@ globalgen_headers_TARGET := export
 INSTALL_TARGETS += globalgen_headers
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef GNU_CC
 CXXFLAGS += -Wno-uninitialized

dom/bindings/moz.build

@@ -43,3 +43,5 @@ LIBRARY_NAME = 'dombindings_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/bluetooth/Makefile.in

@@ -51,4 +51,3 @@ LOCAL_INCLUDES += $(VPATH:%=-I%)
 endif # MOZ_B2G_BT
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/bluetooth/moz.build

@@ -84,3 +84,5 @@ IPDL_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/browser-element/Makefile.in

@@ -6,7 +6,6 @@ include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/dom/base \

dom/browser-element/moz.build

@@ -34,3 +34,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_browserelement_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/camera/Makefile.in

@@ -4,4 +4,3 @@
 
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/camera/moz.build

@@ -53,3 +53,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domcamera_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/devicestorage/Makefile.in

@@ -12,4 +12,3 @@ LOCAL_INCLUDES = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/devicestorage/ipc/Makefile.in

@@ -5,4 +5,3 @@
 MOCHITEST_FILES := ../test/devicestorage_common.js
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/devicestorage/ipc/moz.build

@@ -6,3 +6,5 @@
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/devicestorage/moz.build

@@ -36,3 +36,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domdevicestorage_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/fmradio/Makefile.in

@@ -5,5 +5,4 @@
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

dom/fmradio/ipc/Makefile.in

@@ -9,5 +9,4 @@ LOCAL_INCLUDES += \
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

dom/fmradio/ipc/moz.build

@@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True
 LIBXUL_LIBRARY = True
 LIBRARY_NAME   = 'domfmradio_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/fmradio/moz.build

@@ -33,3 +33,5 @@ IPDL_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/gamepad/Makefile.in

@@ -7,4 +7,3 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/gamepad/moz.build

@@ -22,3 +22,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domgamepad_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/icc/src/Makefile.in

@@ -11,4 +11,3 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/icc/src/moz.build

@@ -20,3 +20,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_icc_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/indexedDB/Makefile.in

@@ -15,4 +15,3 @@ LOCAL_INCLUDES = \
 
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/indexedDB/ipc/Makefile.in

@@ -8,7 +8,6 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 xpcshell_tests = unit
 

dom/indexedDB/ipc/moz.build

@@ -38,3 +38,5 @@ LIBRARY_NAME = 'dom_indexeddb_ipc_s'
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/indexedDB/moz.build

@@ -68,3 +68,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_indexeddb_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/ipc/Makefile.in

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../../content/base/src \

dom/ipc/moz.build

@@ -79,3 +79,5 @@ LIBRARY_NAME = 'domipc_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/media/Makefile.in

@@ -13,4 +13,3 @@ LOCAL_INCLUDES += \
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/media/moz.build

@@ -51,3 +51,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_media_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/mobilemessage/src/Makefile.in

@@ -4,4 +4,3 @@
 
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/mobilemessage/src/moz.build

@@ -82,3 +82,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'dom_mobilemessage_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/network/src/Makefile.in

@@ -11,4 +11,3 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/network/src/moz.build

@@ -59,3 +59,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_network_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/plugins/base/Makefile.in

@@ -24,6 +24,5 @@ LOCAL_INCLUDES += \
 
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS         += $(TK_CFLAGS)

dom/plugins/base/android/Makefile.in

@@ -16,4 +16,3 @@ LOCAL_INCLUDES += \
 DEFINES += -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"'
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/plugins/base/android/moz.build

@@ -33,3 +33,5 @@ LIBRARY_NAME = 'gkpluginandroid_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/plugins/base/moz.build

@@ -103,3 +103,5 @@ LIBRARY_NAME = 'gkplugin'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/plugins/ipc/Makefile.in

@@ -21,7 +21,6 @@ LOCAL_INCLUDES += \
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS += $(TK_CFLAGS)
 

dom/plugins/ipc/hangui/Makefile.in

@@ -17,7 +17,6 @@ STL_FLAGS = \
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef GNU_CC
 WIN32_EXE_LDFLAGS = -municode

dom/plugins/ipc/hangui/moz.build

@@ -12,3 +12,5 @@ CPP_SOURCES += [
     'MiniShmChild.cpp',
     'PluginHangUIChild.cpp',
 ]
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/plugins/ipc/moz.build

@@ -113,3 +113,5 @@ LIBRARY_NAME = 'domplugins_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/power/Makefile.in

@@ -5,4 +5,3 @@
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/power/moz.build

@@ -36,3 +36,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_power_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/quota/Makefile.in

@@ -9,4 +9,3 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/quota/moz.build

@@ -48,3 +48,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'domquota_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/src/geolocation/Makefile.in

@@ -28,4 +28,3 @@ LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/mac
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/src/geolocation/moz.build

@@ -22,3 +22,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'jsdomgeolocation_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/src/notification/Makefile.in

@@ -10,4 +10,3 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/src/notification/moz.build

@@ -31,3 +31,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'jsdomnotification_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/src/storage/Makefile.in

@@ -12,4 +12,3 @@ DEFINES += -DDOM_STORAGE_TESTS
 endif
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/src/storage/moz.build

@@ -31,3 +31,5 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'jsdomstorage_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/system/Makefile.in

@@ -13,4 +13,3 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/system/android/Makefile.in

@@ -7,4 +7,3 @@ LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/system/android/moz.build

@@ -19,3 +19,5 @@ LIBRARY_NAME = 'domsystemandroid_s'
 
 EXPORT_LIBRARY = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/system/gonk/Makefile.in

@@ -31,4 +31,3 @@ INSTALL_TARGETS += WORKER
 WORKER_DEST = $(FINAL_TARGET)/modules/workers
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk

dom/system/gonk/moz.build

@@ -86,3 +86,5 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemgonk_s'
 
+include('/ipc/chromium/chromium-config.mozbuild')
+

dom/system/mac/Makefile.in

@@ -6,4 +6,3 @@ LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk