Bug 976898 - Move the sdkdecls.h force-include out of the build system; r=bbondy,glandium

This commit is contained in:
Ehsan Akhgari 2014-02-28 08:17:22 -05:00
parent a9922442de
commit 5df2a9cacc
3 changed files with 11 additions and 9 deletions

View File

@ -50,5 +50,15 @@
#include "hunspell_fopen_hooks.h"
#endif
/*
* Force-include sdkdecls.h for building the chromium sandbox code.
*
* CHROMIUM_SANDBOX_BUILD is defined in security/sandbox/moz.build.
* Note that this include path relies on the LOCAL_INCLUDES in that file.
*/
#if defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN)
#include "base/shim/sdkdecls.h"
#endif
#endif /* _MOZILLA_CONFIG_H_ */

View File

@ -3,14 +3,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifeq ($(OS_ARCH),WINNT)
EXTRA_SDK_DECLS = $(topsrcdir)/security/sandbox/chromium/base/shim/sdkdecls.h
ifdef _MSC_VER
OS_CXXFLAGS += -FI $(EXTRA_SDK_DECLS)
else
OS_CXXFLAGS += -include $(EXTRA_SDK_DECLS)
endif
STL_FLAGS =
MOZ_GLUE_LDFLAGS =
endif

View File

@ -121,7 +121,7 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
]
for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
'NOMINMAX', '_CRT_RAND_S'):
'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
DEFINES[var] = True
LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']