зеркало из https://github.com/mozilla/gecko-dev.git
Bug 925571 - Build config for plugin_container windows sandboxing. r=bsmedberg
This commit is contained in:
Родитель
f0af93a292
Коммит
4c0646b2d2
|
@ -50,6 +50,16 @@ include $(topsrcdir)/config/rules.mk
|
||||||
LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
|
LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),WINNT) #{
|
ifeq ($(OS_ARCH),WINNT) #{
|
||||||
|
|
||||||
|
ifdef MOZ_CONTENT_SANDBOX
|
||||||
|
LIBS += ../../security/sandbox/$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX)
|
||||||
|
LIBS += $(NSPR_LIBS)
|
||||||
|
LOCAL_INCLUDES += \
|
||||||
|
-I$(topsrcdir)/security/sandbox \
|
||||||
|
-I$(topsrcdir)/security/ \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
# Note the manifest file exists in the tree, so we use the explicit filename
|
# Note the manifest file exists in the tree, so we use the explicit filename
|
||||||
# here.
|
# here.
|
||||||
EXTRA_DEPS += plugin-container.exe.manifest
|
EXTRA_DEPS += plugin-container.exe.manifest
|
||||||
|
|
|
@ -8,3 +8,9 @@ DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\"
|
||||||
DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"
|
DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
ifdef MOZ_CONTENT_SANDBOX
|
||||||
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
|
LOCAL_INCLUDES += -I$(topsrcdir)/security/sandbox/win/src/sandboxbroker
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -13,6 +13,9 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
|
||||||
MODULE = 'sandbox'
|
MODULE = 'sandbox'
|
||||||
LIBRARY_NAME = 'sandbox_s'
|
LIBRARY_NAME = 'sandbox_s'
|
||||||
EXPORT_LIBRARY = True
|
EXPORT_LIBRARY = True
|
||||||
|
FORCE_STATIC_LIB = True
|
||||||
|
|
||||||
|
DIRS += ['win/src/sandboxbroker']
|
||||||
|
|
||||||
SOURCES += [
|
SOURCES += [
|
||||||
'base/at_exit.cc',
|
'base/at_exit.cc',
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
#
|
||||||
|
FORCE_SHARED_LIB = 1
|
||||||
|
MOZ_GLUE_LDFLAGS =
|
||||||
|
STL_FLAGS =
|
||||||
|
|
||||||
|
LOCAL_INCLUDES += \
|
||||||
|
-I$(topsrcdir)/security \
|
||||||
|
-I$(topsrcdir)/security/sandbox \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
SHARED_LIBRARY_LIBS += \
|
||||||
|
../../../$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX) \
|
||||||
|
$(NSPR_LIBS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
OS_LIBS += $(call EXPAND_LIBNAME,dbghelp)
|
||||||
|
|
||||||
|
DEFINES += -DUNICODE -D_UNICODE -DNS_NO_XPCOM -DNOMINMAX -DSANDBOX_EXPORTS
|
|
@ -0,0 +1,17 @@
|
||||||
|
# -*- 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/.
|
||||||
|
|
||||||
|
MODULE = 'sandboxbroker'
|
||||||
|
LIBRARY_NAME = 'sandboxbroker_s'
|
||||||
|
EXPORT_LIBRARY = True
|
||||||
|
|
||||||
|
SOURCES += [
|
||||||
|
'sandboxBroker.cpp',
|
||||||
|
]
|
||||||
|
|
||||||
|
EXPORTS += [
|
||||||
|
'sandboxBroker.h',
|
||||||
|
]
|
|
@ -40,6 +40,13 @@ SHARED_LIBRARY_LIBS += \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_CONTENT_SANDBOX
|
||||||
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
|
LOCAL_INCLUDES += -I$(srcdir)/../sandboxbroker
|
||||||
|
SHARED_LIBRARY_LIBS += ../../security/sandbox/win/src/sandboxbroker/$(LIB_PREFIX)sandboxbroker_s.$(LIB_SUFFIX)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef MOZ_XUL
|
ifdef MOZ_XUL
|
||||||
SHARED_LIBRARY_LIBS += $(DEPTH)/accessible/src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX)
|
SHARED_LIBRARY_LIBS += $(DEPTH)/accessible/src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX)
|
||||||
endif
|
endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче