author | Birunthan Mohanathas <birunthan@mohanathas.com> |
Sat, 19 Jul 2014 12:43:38 -0700 | |
changeset 195532 | 76be62e9944c0ff34e9a30258fa48b2c73b8cc32 |
parent 195531 | ea01a75b73b1472cfdfce863d08bb850a3fab436 |
child 195533 | 12285ae78c93b17e7b5676c5655061b34ea63445 |
push id | 46612 |
push user | birunthan@mohanathas.com |
push date | Tue, 22 Jul 2014 17:50:36 +0000 |
treeherder | mozilla-inbound@12285ae78c93 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mossop |
bugs | 1041208 |
milestone | 34.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/chrome/moz.build +++ b/chrome/moz.build @@ -1,8 +1,41 @@ # -*- 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/. -DIRS += ['public', 'src'] TEST_DIRS += ['test'] + +XPIDL_SOURCES += [ + 'nsIChromeRegistry.idl', + 'nsIToolkitChromeRegistry.idl', +] + +XPIDL_MODULE = 'chrome' + +EXPORTS.mozilla.chrome += [ + 'RegistryMessageUtils.h', +] + +UNIFIED_SOURCES += [ + 'nsChromeProtocolHandler.cpp', + 'nsChromeRegistry.cpp', + 'nsChromeRegistryChrome.cpp', + 'nsChromeRegistryContent.cpp', +] + +MSVC_ENABLE_PGO = True + +include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'xpcom_core' + +GENERATED_INCLUDES += [ + '/xpcom', +] + +LOCAL_INCLUDES += [ + '/netwerk/base/src', + '/netwerk/protocol/res', + '/xpcom/components' +]
rename from chrome/public/nsIToolkitChromeRegistry.idl rename to chrome/nsIToolkitChromeRegistry.idl
deleted file mode 100644 --- a/chrome/public/moz.build +++ /dev/null @@ -1,13 +0,0 @@ -# -*- 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/. - -XPIDL_SOURCES += [ - 'nsIChromeRegistry.idl', - 'nsIToolkitChromeRegistry.idl', -] - -XPIDL_MODULE = 'chrome' -
deleted file mode 100644 --- a/chrome/src/moz.build +++ /dev/null @@ -1,32 +0,0 @@ -# -*- 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/. - -EXPORTS.mozilla.chrome += [ - 'RegistryMessageUtils.h', -] - -UNIFIED_SOURCES += [ - 'nsChromeProtocolHandler.cpp', - 'nsChromeRegistry.cpp', - 'nsChromeRegistryChrome.cpp', - 'nsChromeRegistryContent.cpp', -] - -MSVC_ENABLE_PGO = True - -include('/ipc/chromium/chromium-config.mozbuild') - -FINAL_LIBRARY = 'xpcom_core' - -GENERATED_INCLUDES += [ - '/xpcom', -] - -LOCAL_INCLUDES += [ - '/netwerk/base/src', - '/netwerk/protocol/res', - '/xpcom/components' -]
--- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -101,17 +101,17 @@ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../src/base', '../src/geolocation', '../src/storage', - '/chrome/src', + '/chrome', '/content/base/src', '/content/media/webspeech/synth/ipc', '/docshell/base', '/dom/base', '/dom/bluetooth', '/dom/bluetooth/ipc', '/dom/devicestorage', '/dom/filesystem',
--- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -86,16 +86,16 @@ GENERATED_INCLUDES += ['..'] LOCAL_INCLUDES += [ '../base', '../components', '../ds', '../glue', '../io', '../reflect/xptinfo', '../threads', - '/chrome/src', + '/chrome', '/docshell/base', ] if CONFIG['MOZ_VPX']: LOCAL_INCLUDES += [ '/media/libvpx', ]