author | Brian O'Keefe <bokeefe@alum.wpi.edu> |
Wed, 02 Oct 2013 13:17:55 -0400 | |
changeset 166713 | c031747aac8ac274af484e0bd46d86c1f119c66b |
parent 166712 | aa7cc951e8210f621d13dd54525ed5c01e65bfa0 |
child 166714 | bad33433e11feff34b1265be39f69765627f172b |
push id | 428 |
push user | bbajaj@mozilla.com |
push date | Tue, 28 Jan 2014 00:16:25 +0000 |
treeherder | mozilla-release@cd72a7ff3a75 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mshal |
bugs | 928709 |
milestone | 27.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/accessible/src/windows/msaa/Makefile.in +++ b/accessible/src/windows/msaa/Makefile.in @@ -1,10 +1,9 @@ # 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 ifneq ($(A11Y_LOG),0) DEFINES += -DA11Y_LOG endif
--- a/accessible/src/windows/msaa/moz.build +++ b/accessible/src/windows/msaa/moz.build @@ -56,8 +56,10 @@ LOCAL_INCLUDES += [ '../sdn', '../uia', ] LIBRARY_NAME = 'accessibility_toolkit_msaa_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -1,15 +1,14 @@ # # 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 LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/protocol/res \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) ifdef MOZ_ENABLE_GTK CXXFLAGS += $(TK_CFLAGS)
--- a/chrome/src/moz.build +++ b/chrome/src/moz.build @@ -18,8 +18,10 @@ CPP_SOURCES += [ ] LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'chrome_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -5,17 +5,16 @@ ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/sctp/datachannel \ $(NULL) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/caps/include \ -I$(topsrcdir)/content/events/src \ -I$(topsrcdir)/content/html/content/src \ -I$(topsrcdir)/content/html/document/src \ -I$(topsrcdir)/content/xbl/src \ -I$(topsrcdir)/content/xml/content/src \
--- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -177,8 +177,10 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconbase_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -5,17 +5,16 @@ ifdef MOZ_WEBGL LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/wrappers \ $(NULL) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) INCLUDES += \ -I$(srcdir)/../../../layout/xul/base/src \ -I$(srcdir)/../../../layout/style \ -I$(srcdir)/../../../layout/generic \ -I$(srcdir)/../../base/src \
--- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -80,8 +80,10 @@ else: FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconcvs_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -1,15 +1,14 @@ # # 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 LOCAL_INCLUDES += \ -I$(srcdir)/../../base/src \ -I$(srcdir)/../../html/content/src \ -I$(srcdir)/../../xul/content/src \ -I$(srcdir)/../../xml/content/src \ -I$(srcdir)/../../../dom/base \ -I$(srcdir)/../../../dom/settings \
--- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -70,8 +70,10 @@ if CONFIG['MOZ_WEBSPEECH']: FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconevents_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -1,15 +1,14 @@ # # 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 INCLUDES += \ -I$(srcdir)/../../document/src \ -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../../events/src \ -I$(srcdir)/../../../xbl/src \ -I$(srcdir)/../../../xul/content/src \ -I$(srcdir)/../../../../layout/forms \
--- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -159,8 +159,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconhtmlcon_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -1,11 +1,10 @@ # # 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 INCLUDES += \ -I$(srcdir)/../../../base/src \ $(NULL)
--- a/content/mathml/content/src/moz.build +++ b/content/mathml/content/src/moz.build @@ -12,8 +12,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkcontentmathml_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -1,14 +1,13 @@ # 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 ifdef MOZ_OMX_DECODER DEFINES += -DMOZ_OMX_DECODER endif LOCAL_INCLUDES += \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/layout/generic \
--- a/content/media/moz.build +++ b/content/media/moz.build @@ -154,8 +154,10 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFI ] LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconmedia_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/omx/Makefile.in +++ b/content/media/omx/Makefile.in @@ -1,14 +1,13 @@ # 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 INCLUDES += \ -I$(srcdir)/mediaresourcemanager \ -I$(topsrcdir)/ipc/chromium/src \ -I$(srcdir)/../../base/src \ -I$(srcdir)/../../html/content/src \ -I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \ -I$(ANDROID_SOURCE)/frameworks/base/include/ \
--- a/content/media/omx/mediaresourcemanager/Makefile.in +++ b/content/media/omx/mediaresourcemanager/Makefile.in @@ -1,16 +1,15 @@ # 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/. FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(srcdir)/ \ -I$(ANDROID_SOURCE)/frameworks/base/include/ \ -I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \ -I$(ANDROID_SOURCE)/frameworks/base/include/utils/ \ -I$(ANDROID_SOURCE)/frameworks/base/include/media/ \ -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
--- a/content/media/omx/mediaresourcemanager/moz.build +++ b/content/media/omx/mediaresourcemanager/moz.build @@ -11,8 +11,10 @@ CPP_SOURCES += [ 'IMediaResourceManagerDeathNotifier.cpp', 'IMediaResourceManagerService.cpp', 'MediaResourceManagerClient.cpp', 'MediaResourceManagerService.cpp', ] LIBRARY_NAME = 'mediaresourcemanager' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/omx/moz.build +++ b/content/media/omx/moz.build @@ -27,8 +27,10 @@ if CONFIG['MOZ_RTSP']: 'RtspOmxDecoder.cpp', 'RtspOmxReader.cpp', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconomx_s' +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/content/media/webaudio/Makefile.in +++ /dev/null @@ -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
--- a/content/media/webaudio/blink/Makefile.in +++ b/content/media/webaudio/blink/Makefile.in @@ -1,8 +1,7 @@ # 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)/content/media/webaudio include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webaudio/blink/moz.build +++ b/content/media/webaudio/blink/moz.build @@ -25,8 +25,10 @@ CPP_SOURCES += [ 'ReverbInputBuffer.cpp', 'ZeroPole.cpp', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebaudio_blink_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/webaudio/moz.build +++ b/content/media/webaudio/moz.build @@ -85,8 +85,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebaudio_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/webrtc/Makefile.in +++ b/content/media/webrtc/Makefile.in @@ -2,17 +2,16 @@ # 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/. ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/media/webrtc/trunk \ -I$(topsrcdir)/media/webrtc/signaling/src/common \ -I$(topsrcdir)/media/webrtc/signaling/src/common/browser_logging \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/camera \
--- a/content/media/webrtc/moz.build +++ b/content/media/webrtc/moz.build @@ -28,8 +28,10 @@ XPIDL_SOURCES += [ CPP_SOURCES += [ 'MediaEngineDefault.cpp', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebrtc_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/webspeech/recognition/Makefile.in +++ b/content/media/webspeech/recognition/Makefile.in @@ -1,7 +1,6 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webspeech/recognition/moz.build +++ b/content/media/webspeech/recognition/moz.build @@ -39,8 +39,10 @@ CPP_SOURCES += [ 'SpeechStreamListener.cpp', 'test/FakeSpeechRecognitionService.cpp', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebspeechrecognition_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -6,9 +6,8 @@ include $(topsrcdir)/dom/dom-config.mk VPATH += \ $(srcdir)/ipc \ $(NULL) LOCAL_INCLUDES += $(VPATH:%=-I%) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webspeech/synth/moz.build +++ b/content/media/webspeech/synth/moz.build @@ -49,8 +49,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebspeechsynth_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/media/webspeech/synth/pico/Makefile.in +++ b/content/media/webspeech/synth/pico/Makefile.in @@ -1,9 +1,8 @@ # 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 $(DEPTH)/config/autoconf.mk include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webspeech/synth/pico/moz.build +++ b/content/media/webspeech/synth/pico/moz.build @@ -10,8 +10,10 @@ CPP_SOURCES += [ 'nsPicoService.cpp', 'PicoModule.cpp' ] LIBRARY_NAME = 'synthpico' LIBXUL_LIBRARY = True EXPORT_LIBRARY = True FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -1,15 +1,14 @@ # # 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 INCLUDES += \ -I$(srcdir)/../../../xml/content/src \ -I$(srcdir)/../../../../dom \ -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../../../layout/generic \ -I$(srcdir)/../../../../layout/xul/base/src \ -I$(srcdir)/../../../../layout/svg \
--- a/content/svg/content/src/moz.build +++ b/content/svg/content/src/moz.build @@ -246,8 +246,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkcontentsvg_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -3,17 +3,16 @@ # 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 MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir)/../shistory/src \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/layout/base \ -I$(topsrcdir)/xpcom/ds \ -I$(topsrcdir)/layout/generic \ -I$(topsrcdir)/layout/xul/base/src \
--- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -65,8 +65,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'basedocshell_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -1,9 +1,8 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/alarm/moz.build +++ b/dom/alarm/moz.build @@ -34,8 +34,10 @@ EXTRA_JS_MODULES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domalarm_s' +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/dom/audiochannel/Makefile.in +++ /dev/null @@ -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
--- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -30,8 +30,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domaudiochannel_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -12,17 +12,16 @@ ifdef MOZ_B2G_RIL DEFINES += -DMOZ_B2G_RIL endif ifdef MOZ_B2G_FM DEFINES += -DMOZ_B2G_FM endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/src \ -I$(topsrcdir)/js/xpconnect/wrappers \ -I$(topsrcdir)/xpcom/ds \ $(NULL) ifdef MOZ_X11
--- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -120,8 +120,10 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'jsdombase_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -4,9 +4,8 @@ include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -16,8 +16,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_battery_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -114,17 +114,16 @@ globalgen_headers_FILES := \ UnionConversions.h \ UnionTypes.h \ $(NULL) globalgen_headers_DEST = $(ABS_DIST)/include/mozilla/dom 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 endif # If you change bindinggen_dependencies here, change it in # dom/bindings/test/Makefile.in too. bindinggen_dependencies := \
--- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -38,8 +38,10 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'dombindings_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -46,9 +46,8 @@ endif # Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend # subdirectory. LOCAL_INCLUDES += $(VPATH:%=-I%) endif # MOZ_B2G_BT include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -79,8 +79,10 @@ EXPORTS.mozilla.dom.bluetooth += [ IPDL_SOURCES += [ 'ipc/BluetoothTypes.ipdlh', 'ipc/PBluetooth.ipdl', 'ipc/PBluetoothRequest.ipdl', ] FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -1,16 +1,15 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ $(NULL)
--- a/dom/browser-element/moz.build +++ b/dom/browser-element/moz.build @@ -29,8 +29,10 @@ EXTRA_JS_MODULES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_browserelement_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -1,7 +1,6 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/camera/moz.build +++ b/dom/camera/moz.build @@ -48,8 +48,10 @@ else: ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domcamera_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -7,9 +7,8 @@ include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/devicestorage/ipc/Makefile.in +++ b/dom/devicestorage/ipc/Makefile.in @@ -1,8 +1,7 @@ # 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/. MOCHITEST_FILES := ../test/devicestorage_common.js include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/devicestorage/ipc/moz.build +++ b/dom/devicestorage/ipc/moz.build @@ -1,8 +1,10 @@ # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- # vim: set filetype=python: # 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/. MOCHITEST_MANIFESTS += ['mochitest.ini'] +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/devicestorage/moz.build +++ b/dom/devicestorage/moz.build @@ -31,8 +31,10 @@ IPDL_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domdevicestorage_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/fmradio/Makefile.in +++ b/dom/fmradio/Makefile.in @@ -1,9 +1,8 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/fmradio/ipc/Makefile.in +++ b/dom/fmradio/ipc/Makefile.in @@ -4,10 +4,9 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/fmradio \ $(NULL) include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/fmradio/ipc/moz.build +++ b/dom/fmradio/ipc/moz.build @@ -18,8 +18,10 @@ CPP_SOURCES += [ 'FMRadioRequestParent.cpp', ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domfmradio_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/fmradio/moz.build +++ b/dom/fmradio/moz.build @@ -28,8 +28,10 @@ if CONFIG['MOZ_B2G_FM']: IPDL_SOURCES += [ 'ipc/PFMRadio.ipdl', 'ipc/PFMRadioRequest.ipdl', ] FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/gamepad/Makefile.in +++ b/dom/gamepad/Makefile.in @@ -2,9 +2,8 @@ # 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)/dom/base \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -17,8 +17,10 @@ CPP_SOURCES = [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domgamepad_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -6,9 +6,8 @@ VPATH = $(srcdir) include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/icc/src/moz.build +++ b/dom/icc/src/moz.build @@ -15,8 +15,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_icc_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -10,9 +10,8 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/src/storage \ -I$(topsrcdir)/dom/quota \ -I$(topsrcdir)/xpcom/build \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -3,17 +3,16 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/indexedDB \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk xpcshell_tests = unit # Copy all the normal xpcshell tests from the regular unit directory. copy-xpcshell-tests: $(call install_cmd,$(wildcard $(topsrcdir)/dom/indexedDB/test/unit/test_*.js) \ $(testxpcobjdir)/$(relativesrcdir)/$(xpcshell_tests))
--- a/dom/indexedDB/ipc/moz.build +++ b/dom/indexedDB/ipc/moz.build @@ -33,8 +33,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_indexeddb_ipc_s' MOCHITEST_MANIFESTS += ['mochitest.ini'] +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -63,8 +63,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_indexeddb_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -1,14 +1,13 @@ # 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 LOCAL_INCLUDES += \ -I$(srcdir)/../../content/base/src \ -I$(srcdir)/../../content/events/src \ -I$(srcdir)/../../docshell/base \ -I$(topsrcdir)/chrome/src \ -I$(topsrcdir)/uriloader/exthandler \ -I$(srcdir)/../../netwerk/base/src \
--- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -74,8 +74,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -8,9 +8,8 @@ include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/media/webrtc/trunk \ -I$(topsrcdir)/media/webrtc/signaling/src/common \ $(NULL) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -46,8 +46,10 @@ if CONFIG['MOZ_B2G']: ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_media_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -1,7 +1,6 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -77,8 +77,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'dom_mobilemessage_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -6,9 +6,8 @@ VPATH = $(srcdir) include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/network/src/moz.build +++ b/dom/network/src/moz.build @@ -54,8 +54,10 @@ IPDL_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_network_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -19,11 +19,10 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/gfx/skia/include/core \ -I$(topsrcdir)/gfx/skia/include/config \ $(MOZ_CAIRO_CFLAGS) \ $(MOZ_PIXMAN_CFLAGS) \ $(NULL) include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(TK_CFLAGS)
--- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -11,9 +11,8 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/gfx/gl \ $(MOZ_CAIRO_CFLAGS) \ $(MOZ_PIXMAN_CFLAGS) \ $(NULL) DEFINES += -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/plugins/base/android/moz.build +++ b/dom/plugins/base/android/moz.build @@ -28,8 +28,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkpluginandroid_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -98,8 +98,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'andr LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkplugin' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -16,15 +16,14 @@ LOCAL_INCLUDES = \ ifeq (WINNT,$(OS_ARCH)) LOCAL_INCLUDES += \ -I$(srcdir)/hangui \ -I$(topsrcdir)/widget/shared \ $(NULL) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(TK_CFLAGS) DEFINES += -DFORCE_PR_LOG CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
--- a/dom/plugins/ipc/hangui/Makefile.in +++ b/dom/plugins/ipc/hangui/Makefile.in @@ -12,13 +12,12 @@ DEFINES += \ STL_FLAGS = \ -D_HAS_EXCEPTIONS=0 \ $(NULL) MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC WIN32_EXE_LDFLAGS = -municode endif
--- a/dom/plugins/ipc/hangui/moz.build +++ b/dom/plugins/ipc/hangui/moz.build @@ -7,8 +7,10 @@ FAIL_ON_WARNINGS = True PROGRAM = 'plugin-hang-ui' CPP_SOURCES += [ 'MiniShmChild.cpp', 'PluginHangUIChild.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -108,8 +108,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domplugins_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -1,8 +1,7 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -31,8 +31,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_power_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -4,9 +4,8 @@ include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ -I$(topsrcdir)/caps/include \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -43,8 +43,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'domquota_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -23,9 +23,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gonk) LOCAL_INCLUDES += -I$(topsrcdir)/dom/system/gonk endif ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) LOCAL_INCLUDES += -I$(topsrcdir)/dom/system/mac endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/src/geolocation/moz.build +++ b/dom/src/geolocation/moz.build @@ -17,8 +17,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'jsdomgeolocation_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -5,9 +5,8 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/src/notification/moz.build +++ b/dom/src/notification/moz.build @@ -26,8 +26,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'jsdomnotification_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -7,9 +7,8 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/events/src ifdef ENABLE_TESTS DEFINES += -DDOM_STORAGE_TESTS endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -26,8 +26,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'jsdomstorage_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -8,9 +8,8 @@ DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\ LOCAL_INCLUDES += \ -I$(topsrcdir)/content/events/src \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/bindings \ -I$(topsrcdir)/js/xpconnect/loader \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -2,9 +2,8 @@ # 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)/dom/src/geolocation \ -I$(topsrcdir)/content/events/src $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/android/moz.build +++ b/dom/system/android/moz.build @@ -14,8 +14,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemandroid_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -26,9 +26,8 @@ LOCAL_INCLUDES = \ WORKER_FILES := worker_buf.js \ $(NULL) INSTALL_TARGETS += WORKER WORKER_DEST = $(FINAL_TARGET)/modules/workers include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -81,8 +81,10 @@ EXTRA_JS_MODULES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemgonk_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/system/mac/Makefile.in +++ b/dom/system/mac/Makefile.in @@ -1,9 +1,8 @@ # 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)/dom/src/geolocation \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/mac/moz.build +++ b/dom/system/mac/moz.build @@ -11,8 +11,10 @@ CMMSRCS += ['CoreLocationLocationProvide FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemmac_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -52,8 +52,10 @@ if CONFIG['OS_TARGET'] != 'Android' or C FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystem_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -4,9 +4,8 @@ ifdef MOZ_ENABLE_QTMOBILITY LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) \ -I$(topsrcdir)/dom/src/geolocation \ $(NULL) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/unix/moz.build +++ b/dom/system/unix/moz.build @@ -15,8 +15,10 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']: FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemunix_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -1,7 +1,6 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/telephony/moz.build +++ b/dom/telephony/moz.build @@ -54,8 +54,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk 'gonk/TelephonyProvider.manifest', ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domtelephony_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -1,8 +1,7 @@ # 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)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -27,8 +27,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_time_s' +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/extensions/cookie/Makefile.in +++ /dev/null @@ -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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/extensions/cookie/moz.build +++ b/extensions/cookie/moz.build @@ -25,8 +25,10 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'cookie' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/gfx/2d/Makefile.in +++ b/gfx/2d/Makefile.in @@ -35,17 +35,16 @@ endif # For Direct2D 1.1 we require WINSDK_MAXVER 0x06020000 or higher. ifdef MOZ_ENABLE_DIRECT2D1_1 DEFINES += -DUSE_D2D1_1 endif endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk # Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those # macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This # changes the symbol names of exported C++ functions that use LOGFONT. DEFINES := $(filter-out -DUNICODE -D_UNICODE,$(DEFINES)) # The file uses SSE2 intrinsics, so it needs special compile flags on some # compilers.
--- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -106,8 +106,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gfx2d' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -13,14 +13,13 @@ LOCAL_INCLUDES = -I$(topsrcdir)/widget/g LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware/include endif ifdef MOZ_ANDROID_OMTC DEFINES += -DMOZ_ANDROID_OMTC endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES := $(filter-out -DUNICODE,$(DEFINES)) CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) CFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
--- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -115,8 +115,10 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gl' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -1,9 +1,8 @@ # # 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 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
--- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -29,8 +29,10 @@ CPP_SOURCES += [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'gfxipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -19,17 +19,16 @@ ifdef MOZ_DEBUG DEFINES += -DD3D_DEBUG_INFO endif ifdef MOZ_ENABLE_D3D10_LAYER DEFINES += -DMOZ_ENABLE_D3D10_LAYER endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/content/events/src \ -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright \ -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \ -I$(ANDROID_SOURCE)/frameworks/av/include/media/stagefright \ -I$(ANDROID_SOURCE)/frameworks/native/include/media/openmax \ $(NULL)
--- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -275,8 +275,10 @@ IPDL_SOURCES = [ ] LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'layers' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/gfx/tests/gtest/Makefile.in +++ b/gfx/tests/gtest/Makefile.in @@ -9,9 +9,8 @@ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PI # Create a GTest library LOCAL_INCLUDES = \ -I$(topsrcdir)/gfx/layers \ -I$(topsrcdir)/gfx/2d \ -I$(topsrcdir)/gfx/2d/unittest \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/gfx/tests/gtest/moz.build +++ b/gfx/tests/gtest/moz.build @@ -34,8 +34,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'wind 'TestRect.cpp', 'TestScaling.cpp', ] LIBXUL_LIBRARY = True EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -39,17 +39,16 @@ DEFINES += \ -DGRAPHITE2_STATIC \ $(NULL) ifeq (WINNT,$(OS_TARGET)) DEFINES += -DOTS_DLL endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES := $(filter-out -DUNICODE,$(DEFINES)) CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) CFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) ifeq ($(MOZ_WIDGET_TOOLKIT),android) CXXFLAGS += $(CAIRO_FT_CFLAGS)
--- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -275,8 +275,10 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER' LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'thebes' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -7,17 +7,16 @@ MOCHITEST_BROWSER_FILES += \ tests/browser_alarms.js \ $(NULL) ifdef MOZ_GAMEPAD LOCAL_INCLUDES = -I$(topsrcdir)/dom/base endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) CXXFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) # So that we can call nsScreenManagerGonk::GetConfiguration(). LOCAL_INCLUDES += -I$(topsrcdir)/widget/gonk LOCAL_INCLUDES += -I$(topsrcdir)/widget/xpwidgets
--- a/hal/moz.build +++ b/hal/moz.build @@ -160,8 +160,10 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'hal_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/image/decoders/icon/android/Makefile.in +++ /dev/null @@ -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
--- a/image/decoders/icon/android/moz.build +++ b/image/decoders/icon/android/moz.build @@ -11,8 +11,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'imgiconandroid_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -14,12 +14,11 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/content/svg/content/src \ -I$(topsrcdir)/content/base/src \ $(NULL) # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h LOCAL_INCLUDES += -I$(topsrcdir)/layout/svg include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk # Because imgFrame.cpp includes "cairo.h" CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
--- a/image/src/moz.build +++ b/image/src/moz.build @@ -42,8 +42,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'imglib2_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -41,17 +41,16 @@ include $(topsrcdir)/config/config.mk ifdef _MSC_VER # Always enter a Windows program through wmain, whether or not we're # a console application. WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS) ifeq ($(OS_ARCH),WINNT) #{ # Note the manifest file exists in the tree, so we use the explicit filename # here. EXTRA_DEPS += plugin-container.exe.manifest #
--- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -12,8 +12,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr CPP_SOURCES += [ 'MozillaRuntimeMainAndroid.cpp', ] FINAL_TARGET = 'dist/bin/lib' else: CPP_SOURCES += [ 'MozillaRuntimeMain.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -98,17 +98,16 @@ endif # } endif # } endif # } OS_CXXFLAGS += $(TK_CFLAGS) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_NATIVE_LIBEVENT # { export-preqs = \ $(call mkdir_deps,$(DIST)/third_party/libevent) \ $(NULL) export:: $(export-preqs)
deleted file mode 100644 --- a/ipc/chromium/chromium-config.mk +++ /dev/null @@ -1,118 +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/. - -ifndef INCLUDED_CONFIG_MK -$(error Must include config.mk before this file.) -endif - -ifdef CHROMIUM_CONFIG_INCLUDED -$(error Must not include chromium-config.mk twice.) -endif - -CHROMIUM_CONFIG_INCLUDED = 1 - -EXTRA_DEPS += $(topsrcdir)/ipc/chromium/chromium-config.mk - -LOCAL_INCLUDES += \ - -I$(topsrcdir)/ipc/chromium/src \ - -I$(topsrcdir)/ipc/glue \ - -I$(DEPTH)/ipc/ipdl/_ipdlheaders \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) # { -OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp) - -OS_WIN = 1 - -DEFINES += \ - -DUNICODE \ - -D_UNICODE \ - -DNOMINMAX \ - -D_CRT_RAND_S \ - -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS \ - -D_SECURE_ATL \ - -DCHROMIUM_BUILD \ - -DU_STATIC_IMPLEMENTATION \ - -DOS_WIN=1 \ - -DWIN32 \ - -D_WIN32 \ - -D_WINDOWS \ - -DWIN32_LEAN_AND_MEAN \ - $(NULL) - -ifdef _MSC_VER -DEFINES += -DCOMPILER_MSVC -endif - -else # } { -OS_POSIX = 1 -DEFINES += -DOS_POSIX=1 - -ifeq ($(OS_ARCH),Darwin) # { - -OS_MACOSX = 1 -DEFINES += \ - -DOS_MACOSX=1 \ - $(NULL) - -else # } { -ifeq ($(OS_ARCH),DragonFly) # { - -OS_DRAGONFLY = 1 -OS_BSD = 1 -OS_LIBS += $(call EXPAND_LIBNAME,kvm) -DEFINES += \ - -DOS_DRAGONFLY=1 \ - -DOS_BSD=1 \ - $(NULL) - -else # } { -ifneq (,$(filter $(OS_ARCH),FreeBSD GNU_kFreeBSD)) # { - -OS_FREEBSD = 1 -OS_BSD = 1 -ifneq ($(OS_ARCH),GNU_kFreeBSD) -OS_LIBS += $(call EXPAND_LIBNAME,kvm) -endif -DEFINES += \ - -DOS_FREEBSD=1 \ - -DOS_BSD=1 \ - $(NULL) - -else # } { -ifeq ($(OS_ARCH),NetBSD) # { - -OS_NETBSD = 1 -OS_BSD = 1 -OS_LIBS += $(call EXPAND_LIBNAME,kvm) -DEFINES += \ - -DOS_NETBSD=1 \ - -DOS_BSD=1 \ - $(NULL) - -else # } { -ifeq ($(OS_ARCH),OpenBSD) # { - -OS_OPENBSD = 1 -OS_BSD = 1 -OS_LIBS += $(call EXPAND_LIBNAME,kvm) -DEFINES += \ - -DOS_OPENBSD=1 \ - -DOS_BSD=1 \ - $(NULL) - -else # } { - -OS_LINUX = 1 -DEFINES += \ - -DOS_LINUX=1 \ - $(NULL) - -endif # } -endif # } -endif # } -endif # } -endif # } -endif # } -
new file mode 100644 --- /dev/null +++ b/ipc/chromium/chromium-config.mozbuild @@ -0,0 +1,75 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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 += [ + '/ipc/chromium/src', + '/ipc/glue', +] + +GENERATED_INCLUDES += [ + '/ipc/ipdl/_ipdlheaders', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + OS_LIBS += [ '$(call EXPAND_LIBNAME,psapi shell32 dbghelp)' ] + + DEFINES.update({ + 'UNICODE': True, + '_UNICODE': True, + 'NOMINMAX': True, + '_CRT_RAND_S': True, + 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS': True, + '_SECURE_ATL': True, + 'CHROMIUM_BUILD': True, + 'U_STATIC_IMPLEMENTATION': True, + 'OS_WIN': 1, + 'WIN32': True, + '_WIN32': True, + '_WINDOWS': True, + 'WIN32_LEAN_AND_MEAN': True, + }) + + if CONFIG['_MSC_VER']: + DEFINES['COMPILER_MSVC'] = True + +else: + DEFINES['OS_POSIX'] = 1 + + if CONFIG['OS_ARCH'] == 'Darwin': + DEFINES['OS_MACOSX'] = 1 + + elif CONFIG['OS_ARCH'] == 'DragonFly': + OS_LIBS += [ '$(call EXPAND_LIBNAME,kvm)' ] + DEFINES.update({ + 'OS_DRAGONFLY': 1, + 'OS_BSD': 1, + }) + + elif CONFIG['OS_ARCH'] == 'FreeBSD' or CONFIG['OS_ARCH'] == 'GNU_kFreeBSD': + if CONFIG['OS_ARCH'] != 'GNU_kFreeBSD': + OS_LIBS += [ '$(call EXPAND_LIBNAME,kvm)' ] + + DEFINES.update({ + 'OS_FREEBSD': 1, + 'OS_BSD': 1, + }) + + elif CONFIG['OS_ARCH'] == 'NetBSD': + OS_LIBS += [ '$(call EXPAND_LIBNAME,kvm)' ] + DEFINES.update({ + 'OS_NETBSD': 1, + 'OS_BSD': 1, + }) + + elif CONFIG['OS_ARCH'] == 'OpenBSD': + OS_LIBS += [ '$(call EXPAND_LIBNAME,kvm)' ] + DEFINES.update({ + 'OS_OPENBSD': 1, + 'OS_BSD': 1, + }) + + else: + DEFINES['OS_LINUX'] = 1
--- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -235,8 +235,10 @@ if ost.find('86') == -1 and ost.find('ar ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'chromium_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/dbus/Makefile.in +++ b/ipc/dbus/Makefile.in @@ -2,14 +2,13 @@ # 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 MOZ_ENABLE_DBUS LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_ENABLE_DBUS CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) endif
--- a/ipc/dbus/moz.build +++ b/ipc/dbus/moz.build @@ -19,8 +19,10 @@ CPP_SOURCES += [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozdbus_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -3,9 +3,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\" DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\" include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -101,8 +101,10 @@ IPDL_SOURCES = [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -9,17 +9,16 @@ GARBAGE += ipdl_lextab.py ipdl_yacctab.p include ipdlsrcs.mk GARBAGE += $(CPPSRCS) LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk # NB: the IPDL compiler manages .ipdl-->.h/.cpp dependencies itself, # which is why we don't have explicit .h/.cpp targets here export:: $(ALL_IPDLSRCS) $(PYTHON) $(topsrcdir)/config/pythonpath.py \ $(PLY_INCLUDE) \ $(srcdir)/ipdl.py \
--- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -12,8 +12,10 @@ MODULE = 'ipdlgen' FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozipdlgen_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/ipdl/test/cxx/Makefile.in +++ b/ipc/ipdl/test/cxx/Makefile.in @@ -46,17 +46,16 @@ EXTRA_PROTOCOLS = \ IPDLTESTSRCS = $(addsuffix .cpp,$(IPDLTESTS)) IPDLTESTHDRS = $(addprefix $(srcdir)/,$(addsuffix .h,$(IPDLTESTS))) TESTER_TEMPLATE := $(srcdir)/IPDLUnitTests.template.cpp GENTESTER := $(srcdir)/genIPDLUnitTests.py include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk IPDLUNITTEST_BIN = $(DEPTH)/dist/bin/ipdlunittest$(BIN_SUFFIX) IPDLUnitTests.cpp : Makefile.in $(GENTESTER) $(TESTER_TEMPLATE) $(IPDLTESTHDRS) $(PYTHON) $(GENTESTER) $(TESTER_TEMPLATE) -t $(IPDLTESTS) -e $(EXTRA_PROTOCOLS) > $@ check-proc::
--- a/ipc/ipdl/test/cxx/app/Makefile.in +++ b/ipc/ipdl/test/cxx/app/Makefile.in @@ -16,9 +16,8 @@ LIBS = \ include $(topsrcdir)/config/config.mk ifdef _MSC_VER WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/ipdl/test/cxx/app/moz.build +++ b/ipc/ipdl/test/cxx/app/moz.build @@ -6,8 +6,10 @@ MODULE = 'ipdlunittest' PROGRAM = 'ipdlunittest' CPP_SOURCES += [ 'TestIPDL.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/ipdl/test/cxx/moz.build +++ b/ipc/ipdl/test/cxx/moz.build @@ -81,8 +81,10 @@ IPDL_SOURCES += [ 'PTestSysVShmem.ipdl', 'PTestUrgency.ipdl', ] LIBXUL_LIBRARY = True EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/keystore/Makefile.in +++ b/ipc/keystore/Makefile.in @@ -1,7 +1,6 @@ # 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/. EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/keystore/moz.build +++ b/ipc/keystore/moz.build @@ -14,8 +14,10 @@ CPP_SOURCES += [ 'KeyStore.cpp' ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozkeystore_s' + +include('/ipc/chromium/chromium-config.mozbuild')
deleted file mode 100644 --- a/ipc/netd/Makefile.in +++ /dev/null @@ -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
--- a/ipc/netd/moz.build +++ b/ipc/netd/moz.build @@ -15,8 +15,10 @@ CPP_SOURCES += [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'moznetd_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/ipc/nfc/Makefile.in +++ /dev/null @@ -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
--- a/ipc/nfc/moz.build +++ b/ipc/nfc/moz.build @@ -13,8 +13,10 @@ if CONFIG['MOZ_B2G_NFC']: ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'moznfc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/ipc/ril/Makefile.in +++ /dev/null @@ -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
--- a/ipc/ril/moz.build +++ b/ipc/ril/moz.build @@ -15,8 +15,10 @@ CPP_SOURCES += [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozril_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -4,9 +4,8 @@ # For xpcshell error messages and nsDependentJSString LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/src \ -I$(topsrcdir)/dom/base \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/testshell/moz.build +++ b/ipc/testshell/moz.build @@ -30,8 +30,10 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'ipcshell_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/ipc/unixsocket/Makefile.in +++ /dev/null @@ -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
--- a/ipc/unixsocket/moz.build +++ b/ipc/unixsocket/moz.build @@ -17,8 +17,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozipcunixsocket_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -5,11 +5,10 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/js/ipc \ -I$(topsrcdir)/js/public \ -I$(topsrcdir)/js/xpconnect/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += -DBIN_SUFFIX='"$(BIN_SUFFIX)"'
--- a/js/ipc/moz.build +++ b/js/ipc/moz.build @@ -20,8 +20,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'jsipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/js/xpconnect/shell/Makefile.in +++ b/js/xpconnect/shell/Makefile.in @@ -23,17 +23,16 @@ LIBS += $(NSPR_LIBS) NSDISTMODE = copy ifeq ($(OS_TEST),ia64) LIBS += $(JEMALLOC_LIBS) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef _MSC_VER # Always enter a Windows program through wmain, whether or not we're # a console application. WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup endif ifdef MOZ_VTUNE
--- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -22,8 +22,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco DEFINES['JS_THREADSAFE'] = True if CONFIG['MOZ_SHARK']: DEFINES['MOZ_SHARK'] = True if CONFIG['MOZ_CALLGRIND']: DEFINES['MOZ_CALLGRIND'] = True if CONFIG['MOZ_VTUNE']: DEFINES['MOZ_VTUNE'] = True + +include('/ipc/chromium/chromium-config.mozbuild') \ No newline at end of file
--- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -60,17 +60,16 @@ ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) ifdef MOZ_APP_BASENAME DEFINES += -DMOZ_APP_BASENAME='"$(MOZ_APP_BASENAME)"' endif DEFINES += -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' endif endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += \ -DJS_THREADSAFE \ $(NULL) ifdef MOZ_JSDEBUGGER DEFINES += -DMOZ_JSDEBUGGER endif
--- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -53,8 +53,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpconnect_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -1,15 +1,14 @@ # # 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 LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(srcdir)/../style \ -I$(srcdir)/../generic \ -I$(srcdir)/../forms \ -I$(srcdir)/../tables \ -I$(srcdir)/../printing \
--- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -103,8 +103,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkbase_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -269,17 +269,16 @@ endif endif ifdef MOZ_GAMEPAD SHARED_LIBRARY_LIBS += \ $(DEPTH)/dom/gamepad/$(LIB_PREFIX)domgamepad_s.$(LIB_SUFFIX) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += -I$(srcdir)/../base \ -I$(srcdir)/../generic \ -I$(srcdir)/../forms \ -I$(srcdir)/../tables \ -I$(srcdir)/../style \ -I$(srcdir)/../xul/base/src \ -I$(srcdir)/../mathml \
--- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -23,8 +23,10 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gklayout' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -2,17 +2,16 @@ # 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/. RESOURCES_HTML = \ $(srcdir)/folder.png \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(srcdir)/../base \ -I$(srcdir)/../forms \ -I$(srcdir)/../style \ -I$(srcdir)/../tables \ -I$(srcdir)/../xul/base/src \
--- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -99,8 +99,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkgeneric_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -1,13 +1,12 @@ # 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 LOCAL_INCLUDES += \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/layout/base \ -I$(topsrcdir)/layout/generic \ -I$(topsrcdir)/layout/xul/base/src \ $(NULL)
--- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -24,8 +24,10 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -8,17 +8,16 @@ OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow endif INSTALL_TARGETS += structlist structlist_FILES := nsStyleStructList.h structlist_DEST = $(DIST)/include structlist_TARGET := export include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir)/../base \ -I$(topsrcdir)/dom/base \ -I$(srcdir)/../generic \ -I$(srcdir)/../xul/base/src \ -I$(srcdir)/../../content/base/src \ -I$(srcdir)/../../content/html/content/src \
--- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -126,8 +126,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkstyle_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/media/webrtc/signaling/test/Makefile.in +++ b/media/webrtc/signaling/test/Makefile.in @@ -181,9 +181,8 @@ ifdef JS_SHARED_LIBRARY LIBS += $(MOZ_ZLIB_LIBS) endif endif endif include $(topsrcdir)/config/config.mk include $(topsrcdir)/media/webrtc/webrtc-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/media/webrtc/signaling/test/moz.build +++ b/media/webrtc/signaling/test/moz.build @@ -8,8 +8,10 @@ MODULE = 'test_signaling' if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': CPP_UNIT_TESTS += [ 'mediaconduit_unittests.cpp', 'mediapipeline_unittest.cpp', 'sdp_unittests.cpp', 'signaling_unittests.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py +++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py @@ -46,17 +46,22 @@ NO_SUBMAKEFILES_RULE = 1 include %(common_mk_path)s """ COMMON_MK = """# This file was generated by mozmake.py. Do not edit it directly. ifndef COMMON_MK_INCLUDED COMMON_MK_INCLUDED := 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk + +LOCAL_INCLUDES += \\ + -I$(topsrcdir)/ipc/chromium/src \\ + -I$(topsrcdir)/ipc/glue \\ + -I$(DEPTH)/ipc/ipdl/_ipdlheaders \\ + $(NULL) ifdef MOZ_DEBUG CFLAGS += $(CPPFLAGS_Debug) $(CFLAGS_Debug) CXXFLAGS += $(CPPFLAGS_Debug) $(CXXFLAGS_Debug) DEFINES += $(DEFINES_Debug) LOCAL_INCLUDES += $(INCLUDES_Debug) ASFLAGS += $(ASFLAGS_Debug) else # non-MOZ_DEBUG
deleted file mode 100644 --- a/modules/libjar/Makefile.in +++ /dev/null @@ -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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -38,8 +38,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -3,17 +3,16 @@ # 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/. DEFINES += -DOS_ARCH=$(OS_ARCH) \ -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \ mailnews.js editor.js \ aix.js unix.js winpref.js os2prefs.js) GARBAGE += greprefs.js # TODO bug 813259 external files should be defined near their location in the source tree.
--- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -17,8 +17,10 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'pref' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -12,17 +12,16 @@ LOCAL_INCLUDES += -I$(topsrcdir)/netwer endif ifdef MOZ_ENABLE_QTNETWORK LOCAL_INCLUDES += -I$(srcdir)/../../system/qt OS_INCLUDES += $(MOZ_QT_CFLAGS) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifeq ($(OS_TARGET),Android) # this works around a "branch out of range" error when compiling this file opt nsURLParsers.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS= endif ifdef MOZ_ENABLE_LIBCONIC OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS)
--- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -108,8 +108,10 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'neckobase_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -106,9 +106,8 @@ LOCAL_INCLUDES += -I$(srcdir)/../wifi endif ifdef MOZ_RTSP LOCAL_INCLUDES += -I$(srcdir)/../protocol/rtsp endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -19,8 +19,10 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'necko' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -8,9 +8,8 @@ ifdef NECKO_COOKIES LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/uconv/src \ $(NULL) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -43,8 +43,10 @@ if CONFIG['NECKO_COOKIES'] and CONFIG['O XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini'] IPDL_SOURCES = [ 'PCookieService.ipdl', ] FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -4,9 +4,8 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../protocol/http \ -I$(srcdir)/../base/src \ -I$(topsrcdir)/modules/libjar \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -41,8 +41,10 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'neckoipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -3,9 +3,8 @@ # 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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -25,8 +25,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkabout_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -1,9 +1,8 @@ # 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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -21,8 +21,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkdevice_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -4,17 +4,16 @@ # 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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifeq ($(OS_ARCH),WINNT) ifndef MOZ_DEBUG ifndef NO_LOGGING DEFINES += -DFORCE_PR_LOG endif endif endif # WINNT
--- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -37,8 +37,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkftp_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -6,9 +6,8 @@ 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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -91,8 +91,10 @@ EXTRA_COMPONENTS += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkhttp_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -3,9 +3,8 @@ # 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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -19,8 +19,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkres_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/protocol/rtsp/Makefile.in +++ b/netwerk/protocol/rtsp/Makefile.in @@ -15,11 +15,10 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/ds \ -I$(srcdir) \ -I$(srcdir)/rtsp \ -I$(srcdir)/controller \ -I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/mpeg2ts \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += -DIMPL_NS_NET -Wno-multichar -DFORCE_PR_LOG
--- a/netwerk/protocol/rtsp/moz.build +++ b/netwerk/protocol/rtsp/moz.build @@ -42,8 +42,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkrtsp_s' + +include('/ipc/chromium/chromium-config.mozbuild')
--- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -5,9 +5,8 @@ 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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -34,8 +34,10 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkwebsocket_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -2,9 +2,8 @@ # 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 -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -30,8 +30,10 @@ IPDL_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkwyciwyg_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -24,9 +24,8 @@ endif ifeq ($(OS_TARGET),WINNT) DEFINES += -D__Userspace_os_Windows=1 else DEFINES += -D__Userspace_os_$(OS_TARGET)=1 endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -19,8 +19,10 @@ CPP_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkdatachan_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -84,13 +84,12 @@ endif endif endif endif endif endif endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC CFLAGS += -std=gnu99 endif
--- a/netwerk/sctp/src/moz.build +++ b/netwerk/sctp/src/moz.build @@ -44,8 +44,10 @@ if CONFIG['OS_TARGET'] == 'Android': CPP_SOURCES += [ 'ifaddrs_android.cpp', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'nksctp_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/netwerk/srtp/src/Makefile.in +++ b/netwerk/srtp/src/Makefile.in @@ -59,13 +59,12 @@ endif ifeq ($(OS_TARGET),WINNT) DEFINES += \ -DHAVE_WINSOCK2_H=1 \ -Dinline=__inline \ $(NULL) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC CFLAGS += -std=gnu99 endif
--- a/netwerk/srtp/src/moz.build +++ b/netwerk/srtp/src/moz.build @@ -34,8 +34,10 @@ CSRCS += [ 'srtp/ekt.c', 'srtp/srtp.c', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'nksrtp_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/security/manager/ssl/tests/gtest/Makefile.in +++ b/security/manager/ssl/tests/gtest/Makefile.in @@ -8,9 +8,8 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/security/manager/ssl/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/security/manager/ssl/tests/gtest/moz.build +++ b/security/manager/ssl/tests/gtest/moz.build @@ -8,8 +8,10 @@ MODULE = 'ssltest' LIBRARY_NAME = 'ssltest' LIBXUL_LIBRARY = True GTEST_CPP_SOURCES += [ 'TLSIntoleranceTest.cpp', ] + +include('/ipc/chromium/chromium-config.mozbuild')
--- a/security/sandbox/Makefile.in +++ b/security/sandbox/Makefile.in @@ -1,7 +1,6 @@ # 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
--- a/security/sandbox/moz.build +++ b/security/sandbox/moz.build @@ -17,8 +17,10 @@ CPP_SOURCES += [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'sandbox_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -1,8 +1,7 @@ # 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)/toolkit/components/build/ include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/toolkit/components/alerts/moz.build +++ b/toolkit/components/alerts/moz.build @@ -16,8 +16,10 @@ CPP_SOURCES += [ 'nsAlertsService.cpp', 'nsXULAlerts.cpp', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'alerts_s' +include('/ipc/chromium/chromium-config.mozbuild') +
deleted file mode 100644 --- a/toolkit/components/diskspacewatcher/Makefile.in +++ /dev/null @@ -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
--- a/toolkit/components/diskspacewatcher/moz.build +++ b/toolkit/components/diskspacewatcher/moz.build @@ -20,8 +20,10 @@ CPP_SOURCES = [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'diskspacewatcher' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -1,6 +1,5 @@ # 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
--- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -84,8 +84,10 @@ if CONFIG['MOZ_PLACES']: 'PlacesCategoriesStarter.js', 'toolkitplaces.manifest', ] if CONFIG['MOZ_XUL']: EXTRA_COMPONENTS += [ 'nsPlacesAutoComplete.js', 'nsPlacesAutoComplete.manifest', ] +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -24,17 +24,16 @@ DEFINES += -DHISTOGRAMS_FILE_VERSION="$( endif INSTALL_TARGETS += histoenums histoenums_FILES := TelemetryHistogramEnums.h histoenums_DEST = $(DIST)/include/mozilla histoenums_TARGET := export include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk histograms_file := $(srcdir)/Histograms.json histogram_enum_file := TelemetryHistogramEnums.h histogram_data_file := TelemetryHistogramData.inc enum_python_deps := \ $(srcdir)/gen-histogram-enum.py \ $(srcdir)/histogram_tools.py \
--- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -41,8 +41,10 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'telemetry' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -22,12 +22,11 @@ TARGET_LOCAL_INCLUDES = \ -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/ \ $(NULL) endif LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src DEFINES += -DUNICODE -D_UNICODE include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk check:: $(PYTHON) $(srcdir)/tools/unit-symbolstore.py
--- a/toolkit/crashreporter/injector/Makefile.in +++ b/toolkit/crashreporter/injector/Makefile.in @@ -5,16 +5,15 @@ FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 STL_FLAGS = MOZ_GLUE_LDFLAGS = SHARED_LIBRARY_LIBS += ../breakpad-windows-standalone/$(LIB_PREFIX)google_breakpad_standalone_s.$(LIB_SUFFIX) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src ifndef GNU_CC LDFLAGS += -ENTRY:DummyEntryPoint else LDFLAGS += -Wl,-e,_DummyEntryPoint@12 endif
--- a/toolkit/crashreporter/injector/moz.build +++ b/toolkit/crashreporter/injector/moz.build @@ -5,8 +5,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. CPP_SOURCES += [ 'injector.cpp', ] LIBRARY_NAME = 'breakpadinjector' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -78,8 +78,10 @@ EXTRA_JS_MODULES += [ ] LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'exception_handler_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -103,17 +103,16 @@ SHARED_LIBRARY_LIBS += \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \ $(NULL) endif endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/testing/gtest/mozilla \ -I$(srcdir)/../profile \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/toolkit/crashreporter \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/xpcom/build \
--- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -95,8 +95,10 @@ if CONFIG['MOZ_UPDATER']: ] LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xulapp_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -41,13 +41,12 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) LOCAL_INCLUDES += -I$(srcdir)/win endif ifdef MOZ_ENABLE_DBUS LOCAL_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT))) CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) endif
--- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -129,8 +129,10 @@ IPDL_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'exthandler_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -4,11 +4,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk # vim: ts=4 sw=4 noexpandtab
--- a/uriloader/prefetch/moz.build +++ b/uriloader/prefetch/moz.build @@ -34,8 +34,10 @@ IPDL_SOURCES += [ ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'prefetch_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -1,16 +1,15 @@ # 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/. SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk #DEFINES += -DDEBUG_WIDGETS LOCAL_INCLUDES += \ -I$(topsrcdir)/widget/xpwidgets \ -I$(topsrcdir)/widget/shared \ -I$(topsrcdir)/dom/system/android \ -I$(topsrcdir)/docshell/base \
--- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -43,8 +43,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_android' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -15,17 +15,16 @@ VPATH = \ $(srcdir) \ $(srcdir)/libui \ $(NULL) SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += -DHAVE_OFF64_T -DSK_BUILD_FOR_ANDROID_NDK ifdef MOZ_OMX_DECODER DEFINES += -DMOZ_OMX_DECODER endif LOCAL_INCLUDES += \
--- a/widget/gonk/libdisplay/Makefile.in +++ b/widget/gonk/libdisplay/Makefile.in @@ -15,17 +15,16 @@ VPATH = \ $(srcdir) \ $(NULL) FORCE_STATIC_LIB= 1 STL_FLAGS= include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += -DXPCOM_GLUE LOCAL_INCLUDES += \ -I$(ANDROID_SOURCE)/hardware/libhardware/include \ -I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include \ -I$(ANDROID_SOURCE)/frameworks/native/include/gui \ -I$(ANDROID_SOURCE)/frameworks/native/opengl/include \
--- a/widget/gonk/libdisplay/moz.build +++ b/widget/gonk/libdisplay/moz.build @@ -35,8 +35,10 @@ elif CONFIG['ANDROID_VERSION'] == '15': CPP_SOURCES += [ 'GonkDisplayICS.cpp' ] else: error('Unsupported platform version: %s' % (CONFIG['ANDROID_VERSION'])) LIBRARY_NAME = 'display' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -60,8 +60,10 @@ CPP_SOURCES += [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_gonk' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/gonk/nativewindow/Makefile.in +++ b/widget/gonk/nativewindow/Makefile.in @@ -9,9 +9,8 @@ # 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. STL_FLAGS= include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/widget/gonk/nativewindow/moz.build +++ b/widget/gonk/nativewindow/moz.build @@ -49,8 +49,10 @@ if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['M ] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'nativewindow' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/gtk/Makefile.in +++ b/widget/gtk/Makefile.in @@ -9,17 +9,16 @@ NATIVE_THEME_SUPPORT = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a ifdef NATIVE_THEME_SUPPORT DEFINES += -DNATIVE_THEME_SUPPORT endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS) CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) \ $(MOZ_STARTUP_NOTIFICATION_CFLAGS) CFLAGS += $(TK_CFLAGS) CXXFLAGS += $(TK_CFLAGS)
--- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -78,8 +78,10 @@ if CONFIG['MOZ_ENABLE_GTK2']: ] else: CSRCS += [ 'gtk3drawing.c', ] EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -1,17 +1,16 @@ # # 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/. SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \ $(MOZ_PIXMAN_CFLAGS) CFLAGS += $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \ $(MOZ_PIXMAN_CFLAGS) #DEFINES += -DDEBUG_WIDGETS
--- a/widget/qt/moz.build +++ b/widget/qt/moz.build @@ -52,8 +52,10 @@ if CONFIG[' MOZ_ENABLE_QTMOBILITY']: ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_qt' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -1,9 +1,8 @@ # # 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 CXXFLAGS += $(TK_CFLAGS)
--- a/widget/shared/moz.build +++ b/widget/shared/moz.build @@ -14,8 +14,10 @@ CPP_SOURCES += [ 'WidgetEventImpl.cpp', 'WidgetUtils.cpp', ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_shared' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -26,11 +26,10 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/layout/generic \ -I$(topsrcdir)/layout/xul/base/src \ -I$(topsrcdir)/toolkit/xre \ -I$(topsrcdir)/xpcom/base \ -I$(topsrcdir)/content/events/src \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
--- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -86,8 +86,10 @@ if CONFIG['NS_ENABLE_TSF']: LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'widget_windows' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/windows/winrt/Makefile.in +++ b/widget/windows/winrt/Makefile.in @@ -34,11 +34,10 @@ GARBAGE += $(MIDL_GENERATED_FILES) done_ do_interfaces_gen: UIABridge.idl $(MIDL) $(srcdir)/UIABridge.idl -I $(srcdir) touch $@ export:: do_interfaces_gen include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
--- a/widget/windows/winrt/moz.build +++ b/widget/windows/winrt/moz.build @@ -28,8 +28,10 @@ EXTRA_COMPONENTS += [ ] LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_winrt' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -29,11 +29,10 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/layout/forms \ -I$(topsrcdir)/layout/generic \ -I$(topsrcdir)/layout/xul/base/src \ -I$(topsrcdir)/view/src \ -I$(srcdir) \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(TK_CFLAGS)
--- a/widget/xpwidgets/moz.build +++ b/widget/xpwidgets/moz.build @@ -60,8 +60,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt' ] LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpwidgets_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -16,17 +16,16 @@ INSTALL_TARGETS += errorlist errorlist_FILES := \ ErrorListCDefines.h \ ErrorListCxxDefines.h \ $(NULL) errorlist_DEST = $(DIST)/include errorlist_TARGET := export include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_WIDGET_GTK CXXFLAGS += $(TK_CFLAGS) endif LOCAL_INCLUDES += \ -I$(srcdir)/../build \ -I$(topsrcdir)/xpcom/ds \
--- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -126,8 +126,10 @@ CSRCS += [ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpcombase_s' +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -41,17 +41,16 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../components \ -I$(srcdir)/../threads \ -I$(srcdir)/../reflect/xptinfo/src \ -I$(topsrcdir)/chrome/src \ -I$(srcdir)/../../docshell/base \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += \ -D_IMPL_NS_STRINGAPI \ -DOMNIJAR_NAME="$(OMNIJAR_NAME)" \ $(NULL) ifdef TARGET_XPCOM_ABI DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
--- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -58,8 +58,10 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpcom_core' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') +
--- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -1,15 +1,14 @@ # 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/. MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifeq ($(OS_ARCH),Linux) ifneq (,$(findstring lib64,$(libdir))) DEFINES += -DHAVE_USR_LIB64_DIR endif endif LOCAL_INCLUDES += -I..