From 4c98f6195635e7d44d32405cc2413812e73960af Mon Sep 17 00:00:00 2001 From: Brian O'Keefe Date: Wed, 2 Oct 2013 13:17:55 -0400 Subject: [PATCH] Bug 928709 - Convert chromium-config.mk to mozbuild, r=mshal --- accessible/src/windows/msaa/Makefile.in | 1 - accessible/src/windows/msaa/moz.build | 2 + chrome/src/Makefile.in | 1 - chrome/src/moz.build | 2 + content/base/src/Makefile.in | 1 - content/base/src/moz.build | 2 + content/canvas/src/Makefile.in | 1 - content/canvas/src/moz.build | 2 + content/events/src/Makefile.in | 1 - content/events/src/moz.build | 2 + content/html/content/src/Makefile.in | 1 - content/html/content/src/moz.build | 2 + content/mathml/content/src/Makefile.in | 1 - content/mathml/content/src/moz.build | 2 + content/media/Makefile.in | 1 - content/media/moz.build | 2 + content/media/omx/Makefile.in | 1 - .../omx/mediaresourcemanager/Makefile.in | 1 - .../media/omx/mediaresourcemanager/moz.build | 2 + content/media/omx/moz.build | 2 + content/media/webaudio/Makefile.in | 6 - content/media/webaudio/blink/Makefile.in | 1 - content/media/webaudio/blink/moz.build | 2 + content/media/webaudio/moz.build | 2 + content/media/webrtc/Makefile.in | 1 - content/media/webrtc/moz.build | 2 + .../media/webspeech/recognition/Makefile.in | 1 - content/media/webspeech/recognition/moz.build | 2 + content/media/webspeech/synth/Makefile.in | 1 - content/media/webspeech/synth/moz.build | 2 + .../media/webspeech/synth/pico/Makefile.in | 1 - content/media/webspeech/synth/pico/moz.build | 2 + content/svg/content/src/Makefile.in | 1 - content/svg/content/src/moz.build | 2 + docshell/base/Makefile.in | 1 - docshell/base/moz.build | 2 + dom/alarm/Makefile.in | 1 - dom/alarm/moz.build | 2 + dom/audiochannel/Makefile.in | 16 --- dom/audiochannel/moz.build | 2 + dom/base/Makefile.in | 1 - dom/base/moz.build | 2 + dom/battery/Makefile.in | 1 - dom/battery/moz.build | 2 + dom/bindings/Makefile.in | 1 - dom/bindings/moz.build | 2 + dom/bluetooth/Makefile.in | 1 - dom/bluetooth/moz.build | 2 + dom/browser-element/Makefile.in | 1 - dom/browser-element/moz.build | 2 + dom/camera/Makefile.in | 1 - dom/camera/moz.build | 2 + dom/devicestorage/Makefile.in | 1 - dom/devicestorage/ipc/Makefile.in | 1 - dom/devicestorage/ipc/moz.build | 2 + dom/devicestorage/moz.build | 2 + dom/fmradio/Makefile.in | 1 - dom/fmradio/ipc/Makefile.in | 1 - dom/fmradio/ipc/moz.build | 2 + dom/fmradio/moz.build | 2 + dom/gamepad/Makefile.in | 1 - dom/gamepad/moz.build | 2 + dom/icc/src/Makefile.in | 1 - dom/icc/src/moz.build | 2 + dom/indexedDB/Makefile.in | 1 - dom/indexedDB/ipc/Makefile.in | 1 - dom/indexedDB/ipc/moz.build | 2 + dom/indexedDB/moz.build | 2 + dom/ipc/Makefile.in | 1 - dom/ipc/moz.build | 2 + dom/media/Makefile.in | 1 - dom/media/moz.build | 2 + dom/mobilemessage/src/Makefile.in | 1 - dom/mobilemessage/src/moz.build | 2 + dom/network/src/Makefile.in | 1 - dom/network/src/moz.build | 2 + dom/plugins/base/Makefile.in | 1 - dom/plugins/base/android/Makefile.in | 1 - dom/plugins/base/android/moz.build | 2 + dom/plugins/base/moz.build | 2 + dom/plugins/ipc/Makefile.in | 1 - dom/plugins/ipc/hangui/Makefile.in | 1 - dom/plugins/ipc/hangui/moz.build | 2 + dom/plugins/ipc/moz.build | 2 + dom/power/Makefile.in | 1 - dom/power/moz.build | 2 + dom/quota/Makefile.in | 1 - dom/quota/moz.build | 2 + dom/src/geolocation/Makefile.in | 1 - dom/src/geolocation/moz.build | 2 + dom/src/notification/Makefile.in | 1 - dom/src/notification/moz.build | 2 + dom/src/storage/Makefile.in | 1 - dom/src/storage/moz.build | 2 + dom/system/Makefile.in | 1 - dom/system/android/Makefile.in | 1 - dom/system/android/moz.build | 2 + dom/system/gonk/Makefile.in | 1 - dom/system/gonk/moz.build | 2 + dom/system/mac/Makefile.in | 1 - dom/system/mac/moz.build | 2 + dom/system/moz.build | 2 + dom/system/unix/Makefile.in | 1 - dom/system/unix/moz.build | 2 + dom/telephony/Makefile.in | 1 - dom/telephony/moz.build | 2 + dom/time/Makefile.in | 1 - dom/time/moz.build | 2 + extensions/cookie/Makefile.in | 7 -- extensions/cookie/moz.build | 2 + gfx/2d/Makefile.in | 1 - gfx/2d/moz.build | 2 + gfx/gl/Makefile.in | 1 - gfx/gl/moz.build | 2 + gfx/ipc/Makefile.in | 1 - gfx/ipc/moz.build | 2 + gfx/layers/Makefile.in | 1 - gfx/layers/moz.build | 2 + gfx/tests/gtest/Makefile.in | 1 - gfx/tests/gtest/moz.build | 2 + gfx/thebes/Makefile.in | 1 - gfx/thebes/moz.build | 2 + hal/Makefile.in | 1 - hal/moz.build | 2 + image/decoders/icon/android/Makefile.in | 6 - image/decoders/icon/android/moz.build | 2 + image/src/Makefile.in | 1 - image/src/moz.build | 2 + ipc/app/Makefile.in | 1 - ipc/app/moz.build | 2 + ipc/chromium/Makefile.in | 1 - ipc/chromium/chromium-config.mk | 118 ------------------ ipc/chromium/chromium-config.mozbuild | 75 +++++++++++ ipc/chromium/moz.build | 2 + ipc/dbus/Makefile.in | 1 - ipc/dbus/moz.build | 2 + ipc/glue/Makefile.in | 1 - ipc/glue/moz.build | 2 + ipc/ipdl/Makefile.in | 1 - ipc/ipdl/moz.build | 2 + ipc/ipdl/test/cxx/Makefile.in | 1 - ipc/ipdl/test/cxx/app/Makefile.in | 1 - ipc/ipdl/test/cxx/app/moz.build | 2 + ipc/ipdl/test/cxx/moz.build | 2 + ipc/keystore/Makefile.in | 1 - ipc/keystore/moz.build | 2 + ipc/netd/Makefile.in | 6 - ipc/netd/moz.build | 2 + ipc/nfc/Makefile.in | 6 - ipc/nfc/moz.build | 2 + ipc/ril/Makefile.in | 6 - ipc/ril/moz.build | 2 + ipc/testshell/Makefile.in | 1 - ipc/testshell/moz.build | 2 + ipc/unixsocket/Makefile.in | 6 - ipc/unixsocket/moz.build | 2 + js/ipc/Makefile.in | 1 - js/ipc/moz.build | 2 + js/xpconnect/shell/Makefile.in | 1 - js/xpconnect/shell/moz.build | 2 + js/xpconnect/src/Makefile.in | 1 - js/xpconnect/src/moz.build | 2 + layout/base/Makefile.in | 1 - layout/base/moz.build | 2 + layout/build/Makefile.in | 1 - layout/build/moz.build | 2 + layout/generic/Makefile.in | 1 - layout/generic/moz.build | 2 + layout/ipc/Makefile.in | 1 - layout/ipc/moz.build | 2 + layout/style/Makefile.in | 1 - layout/style/moz.build | 2 + media/webrtc/signaling/test/Makefile.in | 1 - media/webrtc/signaling/test/moz.build | 2 + .../tools/gyp/pylib/gyp/generator/mozmake.py | 7 +- modules/libjar/Makefile.in | 7 -- modules/libjar/moz.build | 2 + modules/libpref/src/Makefile.in | 1 - modules/libpref/src/moz.build | 2 + netwerk/base/src/Makefile.in | 1 - netwerk/base/src/moz.build | 2 + netwerk/build/Makefile.in | 1 - netwerk/build/moz.build | 2 + netwerk/cookie/Makefile.in | 1 - netwerk/cookie/moz.build | 2 + netwerk/ipc/Makefile.in | 1 - netwerk/ipc/moz.build | 2 + netwerk/protocol/about/Makefile.in | 1 - netwerk/protocol/about/moz.build | 2 + netwerk/protocol/device/Makefile.in | 1 - netwerk/protocol/device/moz.build | 2 + netwerk/protocol/ftp/Makefile.in | 1 - netwerk/protocol/ftp/moz.build | 2 + netwerk/protocol/http/Makefile.in | 1 - netwerk/protocol/http/moz.build | 2 + netwerk/protocol/res/Makefile.in | 1 - netwerk/protocol/res/moz.build | 2 + netwerk/protocol/rtsp/Makefile.in | 1 - netwerk/protocol/rtsp/moz.build | 2 + netwerk/protocol/websocket/Makefile.in | 1 - netwerk/protocol/websocket/moz.build | 2 + netwerk/protocol/wyciwyg/Makefile.in | 1 - netwerk/protocol/wyciwyg/moz.build | 2 + netwerk/sctp/datachannel/Makefile.in | 1 - netwerk/sctp/datachannel/moz.build | 2 + netwerk/sctp/src/Makefile.in | 1 - netwerk/sctp/src/moz.build | 2 + netwerk/srtp/src/Makefile.in | 1 - netwerk/srtp/src/moz.build | 2 + security/manager/ssl/tests/gtest/Makefile.in | 1 - security/manager/ssl/tests/gtest/moz.build | 2 + security/sandbox/Makefile.in | 1 - security/sandbox/moz.build | 2 + toolkit/components/alerts/Makefile.in | 1 - toolkit/components/alerts/moz.build | 2 + .../components/diskspacewatcher/Makefile.in | 6 - toolkit/components/diskspacewatcher/moz.build | 2 + toolkit/components/places/Makefile.in | 1 - toolkit/components/places/moz.build | 2 + toolkit/components/telemetry/Makefile.in | 1 - toolkit/components/telemetry/moz.build | 2 + toolkit/crashreporter/Makefile.in | 1 - toolkit/crashreporter/injector/Makefile.in | 1 - toolkit/crashreporter/injector/moz.build | 2 + toolkit/crashreporter/moz.build | 2 + toolkit/xre/Makefile.in | 1 - toolkit/xre/moz.build | 2 + uriloader/exthandler/Makefile.in | 1 - uriloader/exthandler/moz.build | 2 + uriloader/prefetch/Makefile.in | 1 - uriloader/prefetch/moz.build | 2 + widget/android/Makefile.in | 1 - widget/android/moz.build | 2 + widget/gonk/Makefile.in | 1 - widget/gonk/libdisplay/Makefile.in | 1 - widget/gonk/libdisplay/moz.build | 2 + widget/gonk/moz.build | 2 + widget/gonk/nativewindow/Makefile.in | 1 - widget/gonk/nativewindow/moz.build | 2 + widget/gtk/Makefile.in | 1 - widget/gtk/moz.build | 2 + widget/qt/Makefile.in | 1 - widget/qt/moz.build | 2 + widget/shared/Makefile.in | 1 - widget/shared/moz.build | 2 + widget/windows/Makefile.in | 1 - widget/windows/moz.build | 2 + widget/windows/winrt/Makefile.in | 1 - widget/windows/winrt/moz.build | 2 + widget/xpwidgets/Makefile.in | 1 - widget/xpwidgets/moz.build | 2 + xpcom/base/Makefile.in | 1 - xpcom/base/moz.build | 2 + xpcom/build/Makefile.in | 1 - xpcom/build/moz.build | 2 + xpcom/io/Makefile.in | 1 - xpcom/io/moz.build | 2 + 257 files changed, 335 insertions(+), 308 deletions(-) delete mode 100644 content/media/webaudio/Makefile.in delete mode 100644 dom/audiochannel/Makefile.in delete mode 100644 extensions/cookie/Makefile.in delete mode 100644 image/decoders/icon/android/Makefile.in delete mode 100644 ipc/chromium/chromium-config.mk create mode 100644 ipc/chromium/chromium-config.mozbuild delete mode 100644 ipc/netd/Makefile.in delete mode 100644 ipc/nfc/Makefile.in delete mode 100644 ipc/ril/Makefile.in delete mode 100644 ipc/unixsocket/Makefile.in delete mode 100644 modules/libjar/Makefile.in delete mode 100644 toolkit/components/diskspacewatcher/Makefile.in diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in index 2aaf149a4d9..1f01ece1d8f 100644 --- a/accessible/src/windows/msaa/Makefile.in +++ b/accessible/src/windows/msaa/Makefile.in @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifneq ($(A11Y_LOG),0) DEFINES += -DA11Y_LOG diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build index 34c4adf86d4..04bd5d7023a 100644 --- a/accessible/src/windows/msaa/moz.build +++ b/accessible/src/windows/msaa/moz.build @@ -61,3 +61,5 @@ LIBRARY_NAME = 'accessibility_toolkit_msaa_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index c09f56a2f04..c43cd3f1e7a 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -4,7 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/protocol/res \ diff --git a/chrome/src/moz.build b/chrome/src/moz.build index 2130b2060f7..64273edbd95 100644 --- a/chrome/src/moz.build +++ b/chrome/src/moz.build @@ -23,3 +23,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'chrome_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 203fa8ec379..bf2387a7e63 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -10,7 +10,6 @@ LOCAL_INCLUDES += \ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/caps/include \ diff --git a/content/base/src/moz.build b/content/base/src/moz.build index 6e999e9d59c..6fe0ef271c3 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -182,3 +182,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconbase_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index 8d8fd0c65b3..b558945ea45 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -10,7 +10,6 @@ LOCAL_INCLUDES += \ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build index 65636f864bf..1942ff6b333 100644 --- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -85,3 +85,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconcvs_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 0c18ec676b6..8151c59d263 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -4,7 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir)/../../base/src \ diff --git a/content/events/src/moz.build b/content/events/src/moz.build index e37e39408e7..c5481b18815 100644 --- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -75,3 +75,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconevents_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index abc70d66cd9..e1e33b37b38 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -4,7 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(srcdir)/../../document/src \ diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build index 4a0b37d938a..3345274f9cd 100644 --- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -164,3 +164,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconhtmlcon_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index 747ee43fd49..d993fbd372b 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -4,7 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(srcdir)/../../../base/src \ diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build index 8e46ae3d14c..d59a26ea8b0 100644 --- a/content/mathml/content/src/moz.build +++ b/content/mathml/content/src/moz.build @@ -17,3 +17,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkcontentmathml_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 80f195569a8..afea591967a 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_OMX_DECODER DEFINES += -DMOZ_OMX_DECODER diff --git a/content/media/moz.build b/content/media/moz.build index a5bc9bd8fd2..7f182fb7e35 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -159,3 +159,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkconmedia_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in index 71bdeafdcac..238b0052c33 100644 --- a/content/media/omx/Makefile.in +++ b/content/media/omx/Makefile.in @@ -3,7 +3,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(srcdir)/mediaresourcemanager \ diff --git a/content/media/omx/mediaresourcemanager/Makefile.in b/content/media/omx/mediaresourcemanager/Makefile.in index 6d87be4e4b7..b79a5a0cd44 100644 --- a/content/media/omx/mediaresourcemanager/Makefile.in +++ b/content/media/omx/mediaresourcemanager/Makefile.in @@ -5,7 +5,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(srcdir)/ \ diff --git a/content/media/omx/mediaresourcemanager/moz.build b/content/media/omx/mediaresourcemanager/moz.build index 54e66083b14..4083855c71c 100644 --- a/content/media/omx/mediaresourcemanager/moz.build +++ b/content/media/omx/mediaresourcemanager/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mediaresourcemanager' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build index 4d06e15ef62..a297e6a4d6c 100644 --- a/content/media/omx/moz.build +++ b/content/media/omx/moz.build @@ -32,3 +32,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconomx_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in deleted file mode 100644 index deb6de83a14..00000000000 --- 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 diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in index 83afbee18fa..ae2ff74b2a6 100644 --- a/content/media/webaudio/blink/Makefile.in +++ b/content/media/webaudio/blink/Makefile.in @@ -5,4 +5,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build index 4168bc8cf2e..3323f427335 100644 --- a/content/media/webaudio/blink/moz.build +++ b/content/media/webaudio/blink/moz.build @@ -30,3 +30,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebaudio_blink_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build index 1173f47756a..fac31f6dd8a 100644 --- a/content/media/webaudio/moz.build +++ b/content/media/webaudio/moz.build @@ -90,3 +90,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebaudio_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in index 75780e0a139..e5682978962 100644 --- a/content/media/webrtc/Makefile.in +++ b/content/media/webrtc/Makefile.in @@ -7,7 +7,6 @@ OS_CXXFLAGS += -DNOMINMAX endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build index a169d9bf3f5..77e0d7305a0 100644 --- a/content/media/webrtc/moz.build +++ b/content/media/webrtc/moz.build @@ -33,3 +33,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebrtc_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in index ba0eb3e44d0..c21bc1c4cf8 100644 --- a/content/media/webspeech/recognition/Makefile.in +++ b/content/media/webspeech/recognition/Makefile.in @@ -4,4 +4,3 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build index 8090b273e7e..882d19aeca2 100644 --- a/content/media/webspeech/recognition/moz.build +++ b/content/media/webspeech/recognition/moz.build @@ -44,3 +44,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebspeechrecognition_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in index c7cb0982db4..be765756531 100644 --- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -11,4 +11,3 @@ VPATH += \ LOCAL_INCLUDES += $(VPATH:%=-I%) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build index 21c6617a6e4..132e97b825b 100644 --- a/content/media/webspeech/synth/moz.build +++ b/content/media/webspeech/synth/moz.build @@ -54,3 +54,5 @@ LIBRARY_NAME = 'gkconwebspeechsynth_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/media/webspeech/synth/pico/Makefile.in b/content/media/webspeech/synth/pico/Makefile.in index 049fd0158b2..4a7fb455792 100644 --- a/content/media/webspeech/synth/pico/Makefile.in +++ b/content/media/webspeech/synth/pico/Makefile.in @@ -6,4 +6,3 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webspeech/synth/pico/moz.build b/content/media/webspeech/synth/pico/moz.build index 5349a2d1a12..bd9d3dbc13a 100644 --- a/content/media/webspeech/synth/pico/moz.build +++ b/content/media/webspeech/synth/pico/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'synthpico' LIBXUL_LIBRARY = True EXPORT_LIBRARY = True FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index 4e8488e1e65..171a65b4982 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -4,7 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(srcdir)/../../../xml/content/src \ diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build index 7e9a8f39794..2da1737b83a 100644 --- a/content/svg/content/src/moz.build +++ b/content/svg/content/src/moz.build @@ -251,3 +251,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkcontentsvg_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 2cee589292a..6ee846455e9 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -8,7 +8,6 @@ DEFINES += -DMOZ_TOOLKIT_SEARCH endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir)/../shistory/src \ diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 463841277ab..0a298fbda69 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -70,3 +70,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'basedocshell_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in index f003358eae2..d248d51a297 100644 --- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -6,4 +6,3 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build index daa6848101e..4d624c283b2 100644 --- a/dom/alarm/moz.build +++ b/dom/alarm/moz.build @@ -39,3 +39,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domalarm_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in deleted file mode 100644 index 5b376aa5754..00000000000 --- 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 diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index 3fe204e58ed..09453b0bd5c 100644 --- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -35,3 +35,5 @@ LIBRARY_NAME = 'domaudiochannel_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index 7dd3b84d478..06d471f8ca5 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -17,7 +17,6 @@ DEFINES += -DMOZ_B2G_FM endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/src \ diff --git a/dom/base/moz.build b/dom/base/moz.build index 2de49632804..e1c2dbaa923 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -125,3 +125,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'jsdombase_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index 8f74d461bd8..7526180c0c2 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -9,4 +9,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/battery/moz.build b/dom/battery/moz.build index 31b6d61ca41..e5c1ed4c9f8 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_battery_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index d4b50119f59..72cf7a94281 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -119,7 +119,6 @@ globalgen_headers_TARGET := export INSTALL_TARGETS += globalgen_headers include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC CXXFLAGS += -Wno-uninitialized diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index 5ac16ed7cfd..ff30fccc026 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -43,3 +43,5 @@ LIBRARY_NAME = 'dombindings_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in index ac9b049ce9b..fcd8ad914f7 100644 --- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -51,4 +51,3 @@ LOCAL_INCLUDES += $(VPATH:%=-I%) endif # MOZ_B2G_BT include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index 9c020338c2f..9148744123a 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -84,3 +84,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in index abe96d370a9..a40b980ac37 100644 --- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -6,7 +6,6 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build index 5a004ab8d13..d7677fbb912 100644 --- a/dom/browser-element/moz.build +++ b/dom/browser-element/moz.build @@ -34,3 +34,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_browserelement_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in index b9fbdbd6790..75f91f7466d 100644 --- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -4,4 +4,3 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/camera/moz.build b/dom/camera/moz.build index 98ae2b91322..a8eaa7617bc 100644 --- a/dom/camera/moz.build +++ b/dom/camera/moz.build @@ -53,3 +53,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domcamera_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in index f99d6690dc0..0b9588e40e5 100644 --- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -12,4 +12,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/devicestorage/ipc/Makefile.in b/dom/devicestorage/ipc/Makefile.in index 0c9e8a6e969..e41f0cf4150 100644 --- a/dom/devicestorage/ipc/Makefile.in +++ b/dom/devicestorage/ipc/Makefile.in @@ -5,4 +5,3 @@ MOCHITEST_FILES := ../test/devicestorage_common.js include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/devicestorage/ipc/moz.build b/dom/devicestorage/ipc/moz.build index 3cf16eb0cfe..8d942e7dad2 100644 --- a/dom/devicestorage/ipc/moz.build +++ b/dom/devicestorage/ipc/moz.build @@ -6,3 +6,5 @@ MOCHITEST_MANIFESTS += ['mochitest.ini'] +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build index fd718c506e0..68fc9cdeae4 100644 --- a/dom/devicestorage/moz.build +++ b/dom/devicestorage/moz.build @@ -36,3 +36,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domdevicestorage_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/fmradio/Makefile.in b/dom/fmradio/Makefile.in index 0a11904e549..41c68273d1f 100644 --- a/dom/fmradio/Makefile.in +++ b/dom/fmradio/Makefile.in @@ -5,5 +5,4 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/fmradio/ipc/Makefile.in b/dom/fmradio/ipc/Makefile.in index 4d9c311a21d..c98d59abca7 100644 --- a/dom/fmradio/ipc/Makefile.in +++ b/dom/fmradio/ipc/Makefile.in @@ -9,5 +9,4 @@ LOCAL_INCLUDES += \ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/fmradio/ipc/moz.build b/dom/fmradio/ipc/moz.build index 0fed84bf876..637934ce208 100644 --- a/dom/fmradio/ipc/moz.build +++ b/dom/fmradio/ipc/moz.build @@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domfmradio_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/fmradio/moz.build b/dom/fmradio/moz.build index 79e0c5485cb..eca4d9793fe 100644 --- a/dom/fmradio/moz.build +++ b/dom/fmradio/moz.build @@ -33,3 +33,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/gamepad/Makefile.in b/dom/gamepad/Makefile.in index 9f4779b1fd1..1ac0f60d4cf 100644 --- a/dom/gamepad/Makefile.in +++ b/dom/gamepad/Makefile.in @@ -7,4 +7,3 @@ LOCAL_INCLUDES += \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index 8b5f4cee5a4..98fdc69584a 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -22,3 +22,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domgamepad_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in index 6382981f40c..97d05acd5ae 100644 --- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -11,4 +11,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/icc/src/moz.build b/dom/icc/src/moz.build index cd724601382..9fc686ced80 100644 --- a/dom/icc/src/moz.build +++ b/dom/icc/src/moz.build @@ -20,3 +20,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_icc_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index d50c9c89878..be837621dfa 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -15,4 +15,3 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index 8f5c2c6b279..2503b1ca59d 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -8,7 +8,6 @@ LOCAL_INCLUDES += \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk xpcshell_tests = unit diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build index 850de43167b..c986d30198b 100644 --- a/dom/indexedDB/ipc/moz.build +++ b/dom/indexedDB/ipc/moz.build @@ -38,3 +38,5 @@ LIBRARY_NAME = 'dom_indexeddb_ipc_s' MOCHITEST_MANIFESTS += ['mochitest.ini'] +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index 77e2b70f582..1fa6f3cec10 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -68,3 +68,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_indexeddb_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index f048301fb4f..9ab72485e44 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir)/../../content/base/src \ diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index a963eb5f8b0..2bbcff19c6d 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -79,3 +79,5 @@ LIBRARY_NAME = 'domipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in index 26902866443..1c6282819b5 100644 --- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -13,4 +13,3 @@ LOCAL_INCLUDES += \ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/media/moz.build b/dom/media/moz.build index 83636aba9a4..d772f2cb4bf 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -51,3 +51,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_media_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index ba0eb3e44d0..c21bc1c4cf8 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -4,4 +4,3 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index 5bb6cf859d0..e0fc199710e 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -82,3 +82,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'dom_mobilemessage_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in index 6382981f40c..97d05acd5ae 100644 --- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -11,4 +11,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build index 35f6555de43..fd546193934 100644 --- a/dom/network/src/moz.build +++ b/dom/network/src/moz.build @@ -59,3 +59,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_network_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in index fcc8d8ca147..2a066976880 100644 --- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -24,6 +24,5 @@ LOCAL_INCLUDES += \ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in index cfeca2563c1..23ae32944d7 100644 --- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -16,4 +16,3 @@ LOCAL_INCLUDES += \ DEFINES += -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build index fb852cbf06b..4506b43fed2 100644 --- a/dom/plugins/base/android/moz.build +++ b/dom/plugins/base/android/moz.build @@ -33,3 +33,5 @@ LIBRARY_NAME = 'gkpluginandroid_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index 61dea6a82ee..3abfb2b486f 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -103,3 +103,5 @@ LIBRARY_NAME = 'gkplugin' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index 96783bc39d8..9bafffb3f57 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -21,7 +21,6 @@ LOCAL_INCLUDES += \ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/dom/plugins/ipc/hangui/Makefile.in b/dom/plugins/ipc/hangui/Makefile.in index a43cad19428..d8abe21ad8e 100644 --- a/dom/plugins/ipc/hangui/Makefile.in +++ b/dom/plugins/ipc/hangui/Makefile.in @@ -17,7 +17,6 @@ STL_FLAGS = \ MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC WIN32_EXE_LDFLAGS = -municode diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build index bb2a67aec31..5eaa22d3fab 100644 --- a/dom/plugins/ipc/hangui/moz.build +++ b/dom/plugins/ipc/hangui/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ 'MiniShmChild.cpp', 'PluginHangUIChild.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index cee7f32749d..4be3ce78e32 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -113,3 +113,5 @@ LIBRARY_NAME = 'domplugins_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in index 77e0fd39739..1a894bcdb2d 100644 --- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -5,4 +5,3 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/power/moz.build b/dom/power/moz.build index d0a44758364..cf1550762d6 100644 --- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -36,3 +36,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_power_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index 13aef919415..cbad903dd58 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -9,4 +9,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/quota/moz.build b/dom/quota/moz.build index 4f2f1c1afb5..bd4bcf3b965 100644 --- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -48,3 +48,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'domquota_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 494a68b7c67..6d94aecfffc 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -28,4 +28,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/system/mac endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build index 2ec62235f9a..23589da031a 100644 --- a/dom/src/geolocation/moz.build +++ b/dom/src/geolocation/moz.build @@ -22,3 +22,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'jsdomgeolocation_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in index 997f5d69367..de615ea2f17 100644 --- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -10,4 +10,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build index 8687cb00cb9..938208fa3ac 100644 --- a/dom/src/notification/moz.build +++ b/dom/src/notification/moz.build @@ -31,3 +31,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'jsdomnotification_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index a80fc8bc629..d6803e3c08f 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -12,4 +12,3 @@ DEFINES += -DDOM_STORAGE_TESTS endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build index 8ca0a094f38..3820bd4c9e2 100644 --- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -31,3 +31,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'jsdomstorage_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in index c7b9d552077..4716af4d841 100644 --- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -13,4 +13,3 @@ LOCAL_INCLUDES += \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in index 1d0ec23eb09..361a55ee6f0 100644 --- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -7,4 +7,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build index 762066844a0..804c469f489 100644 --- a/dom/system/android/moz.build +++ b/dom/system/android/moz.build @@ -19,3 +19,5 @@ LIBRARY_NAME = 'domsystemandroid_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in index 01378e2f935..2130650e202 100644 --- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -31,4 +31,3 @@ INSTALL_TARGETS += WORKER WORKER_DEST = $(FINAL_TARGET)/modules/workers include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build index 3f5e6d5c061..b89597736f5 100644 --- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -86,3 +86,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemgonk_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/system/mac/Makefile.in b/dom/system/mac/Makefile.in index 1535a55cfb0..4a9642399ee 100644 --- a/dom/system/mac/Makefile.in +++ b/dom/system/mac/Makefile.in @@ -6,4 +6,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/system/mac/moz.build b/dom/system/mac/moz.build index 18834373f49..a1064f29e8d 100644 --- a/dom/system/mac/moz.build +++ b/dom/system/mac/moz.build @@ -16,3 +16,5 @@ LIBRARY_NAME = 'domsystemmac_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/system/moz.build b/dom/system/moz.build index c296a74d9d9..75f86a7faf3 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -57,3 +57,5 @@ LIBRARY_NAME = 'domsystem_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in index 1dbd8458396..f71dbc50c5c 100644 --- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -9,4 +9,3 @@ LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) \ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/system/unix/moz.build b/dom/system/unix/moz.build index 98863f4ed38..1a795dcfa06 100644 --- a/dom/system/unix/moz.build +++ b/dom/system/unix/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'domsystemunix_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in index ba0eb3e44d0..c21bc1c4cf8 100644 --- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -4,4 +4,3 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build index 72c7ab7b837..103d51d1bd1 100644 --- a/dom/telephony/moz.build +++ b/dom/telephony/moz.build @@ -59,3 +59,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'domtelephony_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index 77e0fd39739..1a894bcdb2d 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -5,4 +5,3 @@ include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/time/moz.build b/dom/time/moz.build index 5aa2dfff2a5..d4c35f8dd7c 100644 --- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -32,3 +32,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_time_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in deleted file mode 100644 index 431424f2aac..00000000000 --- 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 diff --git a/extensions/cookie/moz.build b/extensions/cookie/moz.build index f2d226c29a3..60079f97a94 100644 --- a/extensions/cookie/moz.build +++ b/extensions/cookie/moz.build @@ -30,3 +30,5 @@ LIBRARY_NAME = 'cookie' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in index a8be9b069ed..945ef95450f 100644 --- a/gfx/2d/Makefile.in +++ b/gfx/2d/Makefile.in @@ -40,7 +40,6 @@ 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 diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index 08973bd2e61..b1a119d19cc 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -111,3 +111,5 @@ LIBRARY_NAME = 'gfx2d' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index 0871f987f03..6a728dab116 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -18,7 +18,6 @@ DEFINES += -DMOZ_ANDROID_OMTC endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES := $(filter-out -DUNICODE,$(DEFINES)) diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index c8efa4da02d..1140bb7a5c9 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -120,3 +120,5 @@ LIBRARY_NAME = 'gl' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in index 02e160eaa0e..be5ae6988a2 100644 --- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -4,6 +4,5 @@ # 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) diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index 52943c8aa19..4b982cc499a 100644 --- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -34,3 +34,5 @@ LIBRARY_NAME = 'gfxipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 6cb91ac2cc7..b9634bc1a61 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -24,7 +24,6 @@ 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 \ diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index 3295cf2a2e3..2dc2f927bdf 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -280,3 +280,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'layers' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/gfx/tests/gtest/Makefile.in b/gfx/tests/gtest/Makefile.in index 386f0f7ff8b..7244ab613af 100644 --- a/gfx/tests/gtest/Makefile.in +++ b/gfx/tests/gtest/Makefile.in @@ -14,4 +14,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build index 5d6b545b69c..a57a0933cf2 100644 --- a/gfx/tests/gtest/moz.build +++ b/gfx/tests/gtest/moz.build @@ -39,3 +39,5 @@ LIBXUL_LIBRARY = True EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index 24e724cd6b9..c5058be3016 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -44,7 +44,6 @@ DEFINES += -DOTS_DLL endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES := $(filter-out -DUNICODE,$(DEFINES)) diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 281c9b1192b..f1a1468d384 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -280,3 +280,5 @@ LIBRARY_NAME = 'thebes' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/hal/Makefile.in b/hal/Makefile.in index a5e2b811ece..514e0aaef9d 100644 --- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -12,7 +12,6 @@ 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) diff --git a/hal/moz.build b/hal/moz.build index 1f49c4d08b4..75f516839c2 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -165,3 +165,5 @@ LIBRARY_NAME = 'hal_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in deleted file mode 100644 index deb6de83a14..00000000000 --- 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 diff --git a/image/decoders/icon/android/moz.build b/image/decoders/icon/android/moz.build index 22789f01c51..2b477a1e1c2 100644 --- a/image/decoders/icon/android/moz.build +++ b/image/decoders/icon/android/moz.build @@ -16,3 +16,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'imgiconandroid_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/image/src/Makefile.in b/image/src/Makefile.in index fdbef391ae4..46aca4a2b40 100644 --- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -19,7 +19,6 @@ LOCAL_INCLUDES += \ 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) diff --git a/image/src/moz.build b/image/src/moz.build index 0cc66f922f4..eb01f897125 100644 --- a/image/src/moz.build +++ b/image/src/moz.build @@ -47,3 +47,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'imglib2_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in index 0a17f552e8e..935f9a45f32 100644 --- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -46,7 +46,6 @@ WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS) diff --git a/ipc/app/moz.build b/ipc/app/moz.build index a407b4e25a1..730fae90b22 100644 --- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -17,3 +17,5 @@ else: CPP_SOURCES += [ 'MozillaRuntimeMain.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in index e573aef4f40..d9b8c07899e 100644 --- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -103,7 +103,6 @@ endif # } OS_CXXFLAGS += $(TK_CFLAGS) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_NATIVE_LIBEVENT # { diff --git a/ipc/chromium/chromium-config.mk b/ipc/chromium/chromium-config.mk deleted file mode 100644 index 46af9d7b2a0..00000000000 --- 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 # } - diff --git a/ipc/chromium/chromium-config.mozbuild b/ipc/chromium/chromium-config.mozbuild new file mode 100644 index 00000000000..c6d34b44634 --- /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 diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index 34b48bf8881..d24083716a1 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -240,3 +240,5 @@ LIBRARY_NAME = 'chromium_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in index a5c9e77c562..2a21c947e55 100644 --- a/ipc/dbus/Makefile.in +++ b/ipc/dbus/Makefile.in @@ -7,7 +7,6 @@ ifdef MOZ_ENABLE_DBUS endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_ENABLE_DBUS CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) diff --git a/ipc/dbus/moz.build b/ipc/dbus/moz.build index 567392ca314..1138c67fa83 100644 --- a/ipc/dbus/moz.build +++ b/ipc/dbus/moz.build @@ -24,3 +24,5 @@ LIBRARY_NAME = 'mozdbus_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in index a94e123dd24..db14b2daa3a 100644 --- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -8,4 +8,3 @@ 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 diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index f922376dbee..2f668016d71 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -106,3 +106,5 @@ LIBRARY_NAME = 'mozipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index 145cb51a33b..ce25edc10f3 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -14,7 +14,6 @@ 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, diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build index dbc2c105ace..af21a372cce 100644 --- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -17,3 +17,5 @@ LIBRARY_NAME = 'mozipdlgen_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in index c41966eb472..b52adbd7b0b 100644 --- a/ipc/ipdl/test/cxx/Makefile.in +++ b/ipc/ipdl/test/cxx/Makefile.in @@ -51,7 +51,6 @@ 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) diff --git a/ipc/ipdl/test/cxx/app/Makefile.in b/ipc/ipdl/test/cxx/app/Makefile.in index ee55c3de192..9fa0a2040ab 100644 --- a/ipc/ipdl/test/cxx/app/Makefile.in +++ b/ipc/ipdl/test/cxx/app/Makefile.in @@ -21,4 +21,3 @@ WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/ipdl/test/cxx/app/moz.build b/ipc/ipdl/test/cxx/app/moz.build index 02f2d572719..7fce33a2d62 100644 --- a/ipc/ipdl/test/cxx/app/moz.build +++ b/ipc/ipdl/test/cxx/app/moz.build @@ -11,3 +11,5 @@ PROGRAM = 'ipdlunittest' CPP_SOURCES += [ 'TestIPDL.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build index 257df9bd650..3693098cafe 100644 --- a/ipc/ipdl/test/cxx/moz.build +++ b/ipc/ipdl/test/cxx/moz.build @@ -86,3 +86,5 @@ LIBXUL_LIBRARY = True EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/keystore/Makefile.in b/ipc/keystore/Makefile.in index 8e1c861dd39..181c541d36e 100644 --- a/ipc/keystore/Makefile.in +++ b/ipc/keystore/Makefile.in @@ -4,4 +4,3 @@ EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/keystore/moz.build b/ipc/keystore/moz.build index 889b474632b..b6019081a82 100644 --- a/ipc/keystore/moz.build +++ b/ipc/keystore/moz.build @@ -19,3 +19,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozkeystore_s' + +include('/ipc/chromium/chromium-config.mozbuild') diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in deleted file mode 100644 index deb6de83a14..00000000000 --- 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 diff --git a/ipc/netd/moz.build b/ipc/netd/moz.build index b43cf9eeddf..6ddddb3cb2d 100644 --- a/ipc/netd/moz.build +++ b/ipc/netd/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'moznetd_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/nfc/Makefile.in b/ipc/nfc/Makefile.in deleted file mode 100644 index deb6de83a14..00000000000 --- 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 diff --git a/ipc/nfc/moz.build b/ipc/nfc/moz.build index c24867e7f34..7e639edef44 100644 --- a/ipc/nfc/moz.build +++ b/ipc/nfc/moz.build @@ -18,3 +18,5 @@ LIBRARY_NAME = 'moznfc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in deleted file mode 100644 index deb6de83a14..00000000000 --- 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 diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build index d88d44d371b..a549d4a4110 100644 --- a/ipc/ril/moz.build +++ b/ipc/ril/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'mozril_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in index 81137dd0c59..2aa00117bcf 100644 --- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -9,4 +9,3 @@ LOCAL_INCLUDES += \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build index 4cb94fb6182..9e790e24eca 100644 --- a/ipc/testshell/moz.build +++ b/ipc/testshell/moz.build @@ -35,3 +35,5 @@ LIBRARY_NAME = 'ipcshell_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in deleted file mode 100644 index deb6de83a14..00000000000 --- 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 diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build index a692386b9d9..5aeab2698f9 100644 --- a/ipc/unixsocket/moz.build +++ b/ipc/unixsocket/moz.build @@ -22,3 +22,5 @@ LIBRARY_NAME = 'mozipcunixsocket_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in index e80d786b88c..a4efa737949 100644 --- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -10,6 +10,5 @@ LOCAL_INCLUDES += \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += -DBIN_SUFFIX='"$(BIN_SUFFIX)"' diff --git a/js/ipc/moz.build b/js/ipc/moz.build index e2c6a9cb646..6bd60bbd070 100644 --- a/js/ipc/moz.build +++ b/js/ipc/moz.build @@ -25,3 +25,5 @@ LIBRARY_NAME = 'jsipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in index 9afe715b0e6..ec47e5b2140 100644 --- a/js/xpconnect/shell/Makefile.in +++ b/js/xpconnect/shell/Makefile.in @@ -28,7 +28,6 @@ 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 diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build index 178b98b8713..3f61908bb56 100644 --- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -27,3 +27,5 @@ 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 diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index fa6e9559993..9745bd8a8c9 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -65,7 +65,6 @@ ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += \ -DJS_THREADSAFE \ diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build index dd774d3a800..f44e3f972c7 100644 --- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -58,3 +58,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpconnect_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 158a72bdfaf..9d8b0f55e34 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -4,7 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir) \ diff --git a/layout/base/moz.build b/layout/base/moz.build index 6aa3e4c056b..7df1f433b30 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -108,3 +108,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkbase_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 2aa1e6baa9d..07b22ec4293 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -274,7 +274,6 @@ SHARED_LIBRARY_LIBS += \ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += -I$(srcdir)/../base \ -I$(srcdir)/../generic \ diff --git a/layout/build/moz.build b/layout/build/moz.build index e38a9429b84..85b85d2d397 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -28,3 +28,5 @@ LIBRARY_NAME = 'gklayout' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 2e91333fb8a..8fdfa780e7f 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -7,7 +7,6 @@ RESOURCES_HTML = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir) \ diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 03a72e59007..2bc9f2577f8 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -104,3 +104,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkgeneric_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index 2399d359dc6..8d726d94472 100644 --- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/content/base/src \ diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index 2bd2869b996..9201fd05ac5 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -29,3 +29,5 @@ LIBRARY_NAME = 'gkipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index 1f83b885b6a..765d7b6d42c 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -13,7 +13,6 @@ structlist_DEST = $(DIST)/include structlist_TARGET := export include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(srcdir)/../base \ diff --git a/layout/style/moz.build b/layout/style/moz.build index 558c4524bed..b5efba25e86 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -131,3 +131,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkstyle_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in index 19031e106f3..252a8e02af3 100644 --- a/media/webrtc/signaling/test/Makefile.in +++ b/media/webrtc/signaling/test/Makefile.in @@ -186,4 +186,3 @@ 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 diff --git a/media/webrtc/signaling/test/moz.build b/media/webrtc/signaling/test/moz.build index e3274cf5b18..30d039f7e96 100644 --- a/media/webrtc/signaling/test/moz.build +++ b/media/webrtc/signaling/test/moz.build @@ -13,3 +13,5 @@ if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': 'sdp_unittests.cpp', 'signaling_unittests.cpp', ] +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py index eb792cea122..c41fe78d6a3 100644 --- a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py +++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py @@ -51,7 +51,12 @@ 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) diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in deleted file mode 100644 index 431424f2aac..00000000000 --- 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 diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build index ede68df107d..bc6a1ccda52 100644 --- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -43,3 +43,5 @@ MSVC_ENABLE_PGO = True EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 64a4f40c9f1..31333bce942 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -8,7 +8,6 @@ DEFINES += -DOS_ARCH=$(OS_ARCH) \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \ mailnews.js editor.js \ diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build index f02cdfc4e98..edf32bcedca 100644 --- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -22,3 +22,5 @@ LIBRARY_NAME = 'pref' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index 18105cd494c..b7bc3ef303b 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -17,7 +17,6 @@ ifdef MOZ_ENABLE_QTNETWORK 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 diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index 85a86acac74..4d665a0e032 100644 --- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -113,3 +113,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'neckobase_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index b003c015703..f81ea6fffce 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -111,4 +111,3 @@ ifdef MOZ_RTSP endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index 020f2070cc2..17f0e67be26 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -24,3 +24,5 @@ LIBRARY_NAME = 'necko' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index 5003dd940a3..38c878c0c4c 100644 --- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -13,4 +13,3 @@ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build index 7bd9633362a..4edb3644604 100644 --- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -48,3 +48,5 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index 7717c381ed0..c73ecde9779 100644 --- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -9,4 +9,3 @@ LOCAL_INCLUDES += \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index e557044d2ce..5bea65cc383 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -46,3 +46,5 @@ LIBRARY_NAME = 'neckoipc_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index 60585d841eb..c4bc96591a6 100644 --- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -8,4 +8,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index a46e469e09d..042f162d764 100644 --- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -30,3 +30,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkabout_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index aeb87f02900..4a6bf9f8abe 100644 --- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -6,4 +6,3 @@ LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index c458602802b..8704902f39e 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -26,3 +26,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkdevice_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index d1ccabda512..1228724737c 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -9,7 +9,6 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifeq ($(OS_ARCH),WINNT) ifndef MOZ_DEBUG diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index b56edd81b86..97ac3e0a97e 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -42,3 +42,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkftp_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index 545fe295a29..ddf20ddb593 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -11,4 +11,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index f27b47193a4..2356e8f0cb5 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -96,3 +96,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkhttp_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index 3b661470308..30ca22c2e20 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -8,4 +8,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 6d18116ef0c..3e2c6d7dfef 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -24,3 +24,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkres_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/protocol/rtsp/Makefile.in b/netwerk/protocol/rtsp/Makefile.in index a38f35d2cd2..1b7b69344f3 100644 --- a/netwerk/protocol/rtsp/Makefile.in +++ b/netwerk/protocol/rtsp/Makefile.in @@ -20,6 +20,5 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += -DIMPL_NS_NET -Wno-multichar -DFORCE_PR_LOG diff --git a/netwerk/protocol/rtsp/moz.build b/netwerk/protocol/rtsp/moz.build index 7caa8d65584..cf307bfb54b 100644 --- a/netwerk/protocol/rtsp/moz.build +++ b/netwerk/protocol/rtsp/moz.build @@ -47,3 +47,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkrtsp_s' + +include('/ipc/chromium/chromium-config.mozbuild') diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index ee9a044e97a..79082ba8452 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -10,4 +10,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index 4414ed17780..dbfba7c1c08 100644 --- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -39,3 +39,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkwebsocket_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index fe882683144..0c1ff710917 100644 --- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -7,4 +7,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index f079e2144ef..661d1807fb2 100644 --- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -35,3 +35,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkwyciwyg_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index c2e9b3348ee..b3bed875c74 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -29,4 +29,3 @@ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index 1a6e9b46c8a..44ef6a030fd 100644 --- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -24,3 +24,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'nkdatachan_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 9697bf363b7..eff7c45ee40 100644 --- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -89,7 +89,6 @@ endif endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC CFLAGS += -std=gnu99 diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build index 0769559bb6b..24ce0e60dcf 100644 --- a/netwerk/sctp/src/moz.build +++ b/netwerk/sctp/src/moz.build @@ -49,3 +49,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'nksctp_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in index 690edcb9e34..fe27a1aad5c 100644 --- a/netwerk/srtp/src/Makefile.in +++ b/netwerk/srtp/src/Makefile.in @@ -64,7 +64,6 @@ DEFINES += \ endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef GNU_CC CFLAGS += -std=gnu99 diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build index bb2cac2c980..58c36e026b4 100644 --- a/netwerk/srtp/src/moz.build +++ b/netwerk/srtp/src/moz.build @@ -39,3 +39,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'nksrtp_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/security/manager/ssl/tests/gtest/Makefile.in b/security/manager/ssl/tests/gtest/Makefile.in index e6d4aceb132..56016e77753 100644 --- a/security/manager/ssl/tests/gtest/Makefile.in +++ b/security/manager/ssl/tests/gtest/Makefile.in @@ -13,4 +13,3 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/security/manager/ssl/tests/gtest/moz.build b/security/manager/ssl/tests/gtest/moz.build index b27c5c99645..26470b157a2 100644 --- a/security/manager/ssl/tests/gtest/moz.build +++ b/security/manager/ssl/tests/gtest/moz.build @@ -13,3 +13,5 @@ LIBXUL_LIBRARY = True GTEST_CPP_SOURCES += [ 'TLSIntoleranceTest.cpp', ] + +include('/ipc/chromium/chromium-config.mozbuild') diff --git a/security/sandbox/Makefile.in b/security/sandbox/Makefile.in index bc4e683f05c..40dabda4efc 100644 --- a/security/sandbox/Makefile.in +++ b/security/sandbox/Makefile.in @@ -4,4 +4,3 @@ include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build index dd1e7d85394..216d3528aa9 100644 --- a/security/sandbox/moz.build +++ b/security/sandbox/moz.build @@ -22,3 +22,5 @@ LIBRARY_NAME = 'sandbox_s' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index eec8bdc94d9..f7fd0b40444 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -5,4 +5,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build index e54c9381b05..9809ea88714 100644 --- a/toolkit/components/alerts/moz.build +++ b/toolkit/components/alerts/moz.build @@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'alerts_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/toolkit/components/diskspacewatcher/Makefile.in b/toolkit/components/diskspacewatcher/Makefile.in deleted file mode 100644 index deb6de83a14..00000000000 --- 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 diff --git a/toolkit/components/diskspacewatcher/moz.build b/toolkit/components/diskspacewatcher/moz.build index 1e70c519feb..fc79af7b5f7 100644 --- a/toolkit/components/diskspacewatcher/moz.build +++ b/toolkit/components/diskspacewatcher/moz.build @@ -25,3 +25,5 @@ LIBRARY_NAME = 'diskspacewatcher' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index deb6de83a14..140bed5040c 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -3,4 +3,3 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build index dad100b360f..0b7ad5b61a9 100644 --- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -89,3 +89,5 @@ if CONFIG['MOZ_PLACES']: 'nsPlacesAutoComplete.js', 'nsPlacesAutoComplete.manifest', ] +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index 7581e18d386..cef2d8e7ff7 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -29,7 +29,6 @@ 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 diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index 6a70a26eb3d..12b5013d233 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -46,3 +46,5 @@ LIBRARY_NAME = 'telemetry' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index c56af5e478e..211a4665406 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -27,7 +27,6 @@ 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 diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in index f5a66b85d32..4297f4e8d56 100644 --- a/toolkit/crashreporter/injector/Makefile.in +++ b/toolkit/crashreporter/injector/Makefile.in @@ -10,7 +10,6 @@ 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 diff --git a/toolkit/crashreporter/injector/moz.build b/toolkit/crashreporter/injector/moz.build index e6a016da278..5a5316bb691 100644 --- a/toolkit/crashreporter/injector/moz.build +++ b/toolkit/crashreporter/injector/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'breakpadinjector' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index 06632a2d3b7..a9c6e668af2 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -83,3 +83,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'exception_handler_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index ed032b8bdde..959c98a4f30 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -108,7 +108,6 @@ endif endif include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk LOCAL_INCLUDES += \ -I$(topsrcdir)/testing/gtest/mozilla \ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index 99da76ea809..d71a9f1f007 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -100,3 +100,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xulapp_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index fa871b63e00..b6fd02236cf 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -46,7 +46,6 @@ 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) diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index 5a0e22af79a..c9bd5790f2a 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -134,3 +134,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'exthandler_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index 0fcef969ed5..86e4a5052d4 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -9,6 +9,5 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk # vim: ts=4 sw=4 noexpandtab diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build index 18f2d5a1d7a..5274f71f96c 100644 --- a/uriloader/prefetch/moz.build +++ b/uriloader/prefetch/moz.build @@ -39,3 +39,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'prefetch_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index 97ff675b268..e85d74f8e6b 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -5,7 +5,6 @@ SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk #DEFINES += -DDEBUG_WIDGETS diff --git a/widget/android/moz.build b/widget/android/moz.build index 5818dae4714..fcb79a041b0 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -48,3 +48,5 @@ LIBRARY_NAME = 'widget_android' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in index 211c38be686..a71cf32f265 100644 --- a/widget/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -20,7 +20,6 @@ VPATH = \ 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 diff --git a/widget/gonk/libdisplay/Makefile.in b/widget/gonk/libdisplay/Makefile.in index b77b2bb7368..8443ef48ee6 100644 --- a/widget/gonk/libdisplay/Makefile.in +++ b/widget/gonk/libdisplay/Makefile.in @@ -20,7 +20,6 @@ FORCE_STATIC_LIB= 1 STL_FLAGS= include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += -DXPCOM_GLUE diff --git a/widget/gonk/libdisplay/moz.build b/widget/gonk/libdisplay/moz.build index 67ed7279276..d333f23ec9a 100644 --- a/widget/gonk/libdisplay/moz.build +++ b/widget/gonk/libdisplay/moz.build @@ -40,3 +40,5 @@ else: LIBRARY_NAME = 'display' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index c1267e321bd..549c70a95c4 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -65,3 +65,5 @@ LIBRARY_NAME = 'widget_gonk' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/gonk/nativewindow/Makefile.in b/widget/gonk/nativewindow/Makefile.in index c30944d90ee..101958c89aa 100644 --- a/widget/gonk/nativewindow/Makefile.in +++ b/widget/gonk/nativewindow/Makefile.in @@ -14,4 +14,3 @@ STL_FLAGS= include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/widget/gonk/nativewindow/moz.build b/widget/gonk/nativewindow/moz.build index df303de45ea..80ffe78a0fb 100644 --- a/widget/gonk/nativewindow/moz.build +++ b/widget/gonk/nativewindow/moz.build @@ -54,3 +54,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'nativewindow' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in index dbca184ceea..d40520ac13c 100644 --- a/widget/gtk/Makefile.in +++ b/widget/gtk/Makefile.in @@ -14,7 +14,6 @@ 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) \ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build index e2498c5fab3..f9ba9a87a58 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -83,3 +83,5 @@ else: EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index e197581d009..55903affea6 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -6,7 +6,6 @@ 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) diff --git a/widget/qt/moz.build b/widget/qt/moz.build index 3b5fb833e52..377e918c733 100644 --- a/widget/qt/moz.build +++ b/widget/qt/moz.build @@ -57,3 +57,5 @@ LIBRARY_NAME = 'widget_qt' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index 6468a43b2c7..34490e6a907 100644 --- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -4,6 +4,5 @@ # 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) diff --git a/widget/shared/moz.build b/widget/shared/moz.build index e5f99669d46..d0818983b26 100644 --- a/widget/shared/moz.build +++ b/widget/shared/moz.build @@ -19,3 +19,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_shared' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index ffa2756a235..73eb8052c9f 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -31,6 +31,5 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) diff --git a/widget/windows/moz.build b/widget/windows/moz.build index 4d6a6fd7fe1..fcfd86139e5 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -91,3 +91,5 @@ LIBRARY_NAME = 'widget_windows' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in index 2f767fa1be0..417cb7911b4 100644 --- a/widget/windows/winrt/Makefile.in +++ b/widget/windows/winrt/Makefile.in @@ -39,6 +39,5 @@ do_interfaces_gen: UIABridge.idl export:: do_interfaces_gen include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build index fd32fb2f9d0..b1f2118dcdd 100644 --- a/widget/windows/winrt/moz.build +++ b/widget/windows/winrt/moz.build @@ -33,3 +33,5 @@ LIBRARY_NAME = 'widget_winrt' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index 5ac9e6a5bca..7b85aee8d4a 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -34,6 +34,5 @@ LOCAL_INCLUDES += \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build index 260606f9b20..885a45cc878 100644 --- a/widget/xpwidgets/moz.build +++ b/widget/xpwidgets/moz.build @@ -65,3 +65,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpwidgets_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index fa3c709be76..4df05059107 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -21,7 +21,6 @@ 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) diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index 53d36bd4597..961267f329f 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -131,3 +131,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpcombase_s' +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 1326fb99cd3..3837dcfa1e6 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -46,7 +46,6 @@ LOCAL_INCLUDES = \ $(NULL) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk DEFINES += \ -D_IMPL_NS_STRINGAPI \ diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index dbf13118622..c43e61bd465 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -63,3 +63,5 @@ LIBRARY_NAME = 'xpcom_core' EXPORT_LIBRARY = True +include('/ipc/chromium/chromium-config.mozbuild') + diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index d3630ef15bb..0f56e9976a3 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -4,7 +4,6 @@ MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk ifeq ($(OS_ARCH),Linux) ifneq (,$(findstring lib64,$(libdir))) diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index 80cde72cf33..7183a7137a9 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -128,3 +128,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpcomio_s' +include('/ipc/chromium/chromium-config.mozbuild') +