mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 13:21:05 +00:00
Bug 968856 - Move unconditional LOCAL_INCLUDES into moz.build; r=mshal
This commit is contained in:
Ms2ger
parent
f7cff805e8
commit
33da18c67e
@ -10,6 +10,3 @@ ifdef MOZ_NATIVE_HUNSPELL
|
||||
CXXFLAGS += $(MOZ_HUNSPELL_CFLAGS)
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/editor/libeditor/base \
|
||||
$(NULL)
|
||||
|
||||
@ -33,3 +33,7 @@ LOCAL_INCLUDES += [
|
||||
'/extensions/spellcheck/src',
|
||||
]
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/editor/libeditor/base',
|
||||
]
|
||||
|
||||
|
||||
@ -4,9 +4,6 @@
|
||||
|
||||
NSDISTMODE = copy
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||||
$(LIBXUL_LIBS) \
|
||||
|
||||
@ -11,3 +11,8 @@ SOURCES += [
|
||||
]
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/xre',
|
||||
'/xpcom/base',
|
||||
]
|
||||
|
||||
|
||||
@ -1,11 +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/.
|
||||
|
||||
# For xpcshell error messages and nsDependentJSString
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/js/xpconnect/src \
|
||||
-I$(topsrcdir)/dom/base \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
@ -30,3 +30,10 @@ FAIL_ON_WARNINGS = True
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
# For xpcshell error messages and nsDependentJSString
|
||||
LOCAL_INCLUDES += [
|
||||
'/dom/base',
|
||||
'/js/xpconnect/src',
|
||||
]
|
||||
|
||||
|
||||
@ -17,32 +17,6 @@ ifdef MOZ_SCTP
|
||||
LIBS += $(DEPTH)/netwerk/sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I. \
|
||||
-I$(topsrcdir)/media/webrtc/trunk/testing/gtest/include/ \
|
||||
-I$(topsrcdir)/media/mtransport/ \
|
||||
-I$(topsrcdir)/netwerk/sctp/src/ \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I. \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/ \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/ \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/crypto \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/ice \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/net \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/stun \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nICEr/src/util \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/share \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/ \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/registry \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/stats \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/plugin \
|
||||
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include
|
||||
ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
|
||||
|
||||
@ -40,3 +40,24 @@ else:
|
||||
|
||||
if CONFIG['OS_TARGET'] in ('Darwin', 'Android'):
|
||||
DEFINES['GTEST_USE_OWN_TR1_TUPLE'] = 1
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/media/mtransport/',
|
||||
'/media/mtransport/third_party/',
|
||||
'/media/mtransport/third_party/nICEr/src/crypto',
|
||||
'/media/mtransport/third_party/nICEr/src/ice',
|
||||
'/media/mtransport/third_party/nICEr/src/net',
|
||||
'/media/mtransport/third_party/nICEr/src/stun',
|
||||
'/media/mtransport/third_party/nICEr/src/util',
|
||||
'/media/mtransport/third_party/nrappkit/src/event',
|
||||
'/media/mtransport/third_party/nrappkit/src/log',
|
||||
'/media/mtransport/third_party/nrappkit/src/plugin',
|
||||
'/media/mtransport/third_party/nrappkit/src/registry',
|
||||
'/media/mtransport/third_party/nrappkit/src/share',
|
||||
'/media/mtransport/third_party/nrappkit/src/stats',
|
||||
'/media/mtransport/third_party/nrappkit/src/util/',
|
||||
'/media/mtransport/third_party/nrappkit/src/util/libekr',
|
||||
'/media/webrtc/trunk/testing/gtest/include/',
|
||||
'/netwerk/sctp/src/',
|
||||
]
|
||||
|
||||
|
||||
@ -11,4 +11,3 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/memory/build
|
||||
|
||||
@ -31,3 +31,8 @@ DEFINES['MOZ_JEMALLOC_IMPL'] = True
|
||||
# See bug 419470
|
||||
if CONFIG['OS_TARGET'] == 'Linux':
|
||||
NO_PGO = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/memory/build',
|
||||
]
|
||||
|
||||
|
||||
@ -3,11 +3,6 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# This makefile just builds support for reading archives.
|
||||
LOCAL_INCLUDES += -I$(srcdir)/../src \
|
||||
-I$(srcdir)/../verify \
|
||||
-I$(topsrcdir)/dist/include \
|
||||
$(NULL)
|
||||
|
||||
CFLAGS += -DMAR_NSS
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -13,5 +13,11 @@ UNIFIED_SOURCES += [
|
||||
|
||||
FORCE_STATIC_LIB = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../src',
|
||||
'../verify',
|
||||
]
|
||||
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
USE_STATIC_LIBS = True
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# This makefile just builds support for reading archives.
|
||||
LOCAL_INCLUDES += -I$(srcdir)/../src
|
||||
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
LOCAL_INCLUDES += -I$(srcdir)/../sign
|
||||
endif
|
||||
|
||||
@ -17,3 +17,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
USE_STATIC_LIBS = True
|
||||
else:
|
||||
DEFINES['MAR_NSS'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../src',
|
||||
]
|
||||
|
||||
|
||||
@ -35,8 +35,6 @@ ifeq ($(HOST_OS_ARCH),WINNT)
|
||||
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/updater
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
HOST_CXXFLAGS += $(MOZ_BZ2_CFLAGS)
|
||||
|
||||
@ -9,3 +9,8 @@ HOST_SOURCES += [
|
||||
]
|
||||
|
||||
HOST_PROGRAM = 'mbsdiff'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/mozapps/update/updater',
|
||||
]
|
||||
|
||||
|
||||
@ -4,6 +4,4 @@
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../src
|
||||
|
||||
STL_FLAGS =
|
||||
|
||||
@ -13,3 +13,8 @@ LIBRARY_NAME = 'profdirserviceprovidersa_s'
|
||||
FORCE_STATIC_LIB = True
|
||||
|
||||
DEFINES['XPCOM_GLUE'] = 1
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../src',
|
||||
]
|
||||
|
||||
|
||||
@ -8,8 +8,4 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/security/manager/ssl/src \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -17,3 +17,8 @@ LOCAL_INCLUDES += [
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/security/manager/ssl/src',
|
||||
]
|
||||
|
||||
|
||||
@ -15,6 +15,3 @@ LIBS = \
|
||||
|
||||
DEFINES += $(TK_CFLAGS)
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../lib \
|
||||
$(NULL)
|
||||
|
||||
@ -15,3 +15,8 @@ SIMPLE_PROGRAMS = [
|
||||
SOURCES += [
|
||||
'%s.cpp' % s for s in SIMPLE_PROGRAMS
|
||||
]
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../lib',
|
||||
]
|
||||
|
||||
|
||||
@ -5,12 +5,6 @@
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
STL_FLAGS =
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/security \
|
||||
-I$(topsrcdir)/security/sandbox \
|
||||
-I$(topsrcdir)/security/sandbox/chromium \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
../../../$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX) \
|
||||
$(NSPR_LIBS) \
|
||||
|
||||
@ -20,3 +20,10 @@ FORCE_SHARED_LIB = True
|
||||
for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'NOMINMAX',
|
||||
'SANDBOX_EXPORTS'):
|
||||
DEFINES[var] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/security',
|
||||
'/security/sandbox',
|
||||
'/security/sandbox/chromium',
|
||||
]
|
||||
|
||||
|
||||
@ -5,13 +5,6 @@
|
||||
# Avoid recursive make to avoid having to add files to the gtest/ subdirectory
|
||||
# (which is third-party code), and to make the build faster.
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/gtest \
|
||||
-I$(srcdir)/gtest/include \
|
||||
-I$(srcdir)/gmock \
|
||||
-I$(srcdir)/gmock/include \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq (browser,$(MOZ_BUILD_APP))
|
||||
|
||||
@ -67,3 +67,10 @@ LIBXUL_LIBRARY = True
|
||||
|
||||
EXPORT_LIBRARY = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'gmock',
|
||||
'gmock/include',
|
||||
'gtest',
|
||||
'gtest/include',
|
||||
]
|
||||
|
||||
|
||||
@ -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/.
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
@ -2,10 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/js/src/ctypes \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
|
||||
|
||||
xpctestdir = $(testxpcobjdir)/$(relativesrcdir)/unit
|
||||
|
||||
@ -16,3 +16,8 @@ UNIFIED_SOURCES += [
|
||||
LIBRARY_NAME = 'jsctypes-test'
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/js/src/ctypes',
|
||||
]
|
||||
|
||||
|
||||
@ -7,6 +7,3 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../protobuf \
|
||||
$(NULL)
|
||||
|
||||
@ -52,3 +52,8 @@ if not CONFIG['MOZ_SUITE']:
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
FINAL_LIBRARY = 'toolkitcomps'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../protobuf',
|
||||
]
|
||||
|
||||
|
||||
@ -38,8 +38,3 @@ include $(topsrcdir)/config/rules.mk
|
||||
ifdef _MSC_VER
|
||||
WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
|
||||
endif
|
||||
|
||||
# Pick up nsWindowsRestart.cpp
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre \
|
||||
-I$(topsrcdir)/toolkit/mozapps/update/common \
|
||||
$(NULL)
|
||||
|
||||
@ -22,4 +22,11 @@ DEFINES['UNICODE'] = True
|
||||
DEFINES['_UNICODE'] = True
|
||||
DEFINES['NS_NO_XPCOM'] = True
|
||||
|
||||
# Pick up nsWindowsRestart.cpp
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/mozapps/update/common',
|
||||
'/toolkit/xre',
|
||||
]
|
||||
|
||||
|
||||
USE_STATIC_LIBS = True
|
||||
|
||||
@ -6,9 +6,6 @@
|
||||
USE_RCS_MK := 1
|
||||
include $(topsrcdir)/config/makefiles/rcs.mk
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads
|
||||
|
||||
DEFINES += -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"'
|
||||
|
||||
MOZ_HISTOGRAMS_VERSION ?= $(call getSourceRepo)/rev/$(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null))
|
||||
|
||||
@ -52,3 +52,9 @@ GENERATED_FILES = [
|
||||
|
||||
if CONFIG['MOZILLA_OFFICIAL']:
|
||||
DEFINES['MOZILLA_OFFICIAL'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/xpcom/build',
|
||||
'/xpcom/threads',
|
||||
]
|
||||
|
||||
|
||||
@ -9,8 +9,6 @@ TARGET_LOCAL_INCLUDES = \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
check::
|
||||
|
||||
@ -15,8 +15,6 @@ MOZ_GLUE_LDFLAGS =
|
||||
MOZ_GLUE_PROGRAM_LDFLAGS =
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBS += \
|
||||
$(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX)
|
||||
|
||||
@ -39,3 +39,8 @@ if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
UNIFIED_SOURCES += [
|
||||
'crashreporter_osx.mm',
|
||||
]
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../google-breakpad/src',
|
||||
]
|
||||
|
||||
|
||||
@ -1,5 +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/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/..
|
||||
@ -2,10 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_TARGET),Android)
|
||||
|
||||
@ -10,3 +10,8 @@ UNIFIED_SOURCES += [
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/crashreporter/google-breakpad/src',
|
||||
]
|
||||
|
||||
|
||||
@ -16,10 +16,6 @@ OS_CXXFLAGS += -fomit-frame-pointer
|
||||
MOZ_FRAMEPTR_FLAGS := -fomit-frame-pointer
|
||||
endif #}
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_TARGET),Android)
|
||||
# NDK5 workarounds
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
|
||||
|
||||
@ -18,3 +18,8 @@ if CONFIG['OS_TARGET'] == 'Android':
|
||||
# NDK5 workarounds
|
||||
DEFINES['_STLP_CONST_CONSTRUCTOR_BUG'] = True
|
||||
DEFINES['_STLP_NO_MEMBER_TEMPLATES'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/crashreporter/google-breakpad/src',
|
||||
]
|
||||
|
||||
|
||||
@ -1,5 +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/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../../..
|
||||
@ -12,3 +12,8 @@ UNIFIED_SOURCES += [
|
||||
XPI_NAME = 'crashreporter'
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../../..',
|
||||
]
|
||||
|
||||
|
||||
@ -1,5 +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/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../../..
|
||||
@ -14,3 +14,8 @@ UNIFIED_SOURCES += [
|
||||
XPI_NAME = 'crashreporter'
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../../..',
|
||||
]
|
||||
|
||||
|
||||
@ -11,3 +11,8 @@ SOURCES += [
|
||||
XPI_NAME = 'crashreporter'
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'..',
|
||||
]
|
||||
|
||||
|
||||
@ -1,5 +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/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../../..
|
||||
@ -13,3 +13,8 @@ SOURCES += [
|
||||
XPI_NAME = 'crashreporter'
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../../..',
|
||||
]
|
||||
|
||||
|
||||
@ -7,8 +7,6 @@ ifdef MOZ_CRASHREPORTER
|
||||
endif
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/..
|
||||
|
||||
ifeq ($(OS_TARGET),Android)
|
||||
TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
|
||||
endif
|
||||
|
||||
@ -2,10 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
|
||||
$(NULL)
|
||||
|
||||
ifneq (Android,$(OS_TARGET))
|
||||
else
|
||||
TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
|
||||
|
||||
@ -42,3 +42,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
DEFINES['ELFSIZE'] = 32
|
||||
|
||||
DEFINES['NO_STABS_SUPPORT'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/crashreporter/google-breakpad/src',
|
||||
]
|
||||
|
||||
|
||||
@ -2,8 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../..
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
COMPILE_CMFLAGS += -std=c99
|
||||
|
||||
@ -33,3 +33,8 @@ SOURCES += [
|
||||
LIBRARY_NAME = 'breakpad_mac_common_s'
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../..',
|
||||
]
|
||||
|
||||
|
||||
@ -87,3 +87,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
DEFINES['NO_STABS_SUPPORT'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'..',
|
||||
]
|
||||
|
||||
|
||||
@ -1,5 +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/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../..
|
||||
@ -23,3 +23,8 @@ HOST_SOURCES += [
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../..',
|
||||
]
|
||||
|
||||
|
||||
@ -1,5 +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/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
|
||||
@ -22,3 +22,9 @@ UNIFIED_SOURCES += [
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xulapp_s'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'..',
|
||||
'../..',
|
||||
]
|
||||
|
||||
|
||||
@ -2,11 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/../../.. \
|
||||
-I$(srcdir)/../../../common/linux \
|
||||
$(NULL)
|
||||
|
||||
HOST_LIBS += \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)host_breakpad_linux_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
|
||||
|
||||
@ -9,3 +9,9 @@ HOST_SOURCES += [
|
||||
]
|
||||
|
||||
HOST_PROGRAM = 'dump_syms'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../../..',
|
||||
'../../../common/linux',
|
||||
]
|
||||
|
||||
|
||||
@ -2,11 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/../../.. \
|
||||
-I$(srcdir)/../../../common/mac \
|
||||
$(NULL)
|
||||
|
||||
HOST_LIBS += \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)host_breakpad_mac_common_s.$(LIB_SUFFIX) \
|
||||
|
||||
@ -10,3 +10,8 @@ HOST_SOURCES += [
|
||||
|
||||
HOST_PROGRAM = 'dump_syms'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../../..',
|
||||
'../../../common/mac',
|
||||
]
|
||||
|
||||
|
||||
@ -2,11 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/../../.. \
|
||||
-I$(srcdir)/../../../common/solaris \
|
||||
$(NULL)
|
||||
|
||||
HOST_LIBS += \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)host_breakpad_solaris_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
|
||||
|
||||
@ -9,3 +9,9 @@ HOST_SOURCES += [
|
||||
]
|
||||
|
||||
HOST_PROGRAM = 'dump_syms'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../../..',
|
||||
'../../../common/solaris',
|
||||
]
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@ MOZ_GLUE_LDFLAGS =
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src
|
||||
ifndef GNU_CC
|
||||
LDFLAGS += -ENTRY:DummyEntryPoint
|
||||
else
|
||||
|
||||
@ -14,4 +14,9 @@ include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/crashreporter/google-breakpad/src',
|
||||
]
|
||||
|
||||
|
||||
USE_STATIC_LIBS = True
|
||||
|
||||
@ -97,4 +97,9 @@ if CONFIG['OS_ARCH'] == 'SunOS':
|
||||
DEFINES['UNICODE'] = True
|
||||
DEFINES['_UNICODE'] = True
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'google-breakpad/src',
|
||||
]
|
||||
|
||||
|
||||
@ -3,9 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../google-breakpad/src/ \
|
||||
$(NULL)
|
||||
EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
|
||||
|
||||
UNIT_FILES = $(SHARED_LIBRARY) $(EXTRA_JS_MODULES)
|
||||
|
||||
@ -32,3 +32,8 @@ DEFINES['SHARED_LIBRARY'] = '%s%s%s' % (
|
||||
)
|
||||
|
||||
DEFINES['NOMINMAX'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../google-breakpad/src/',
|
||||
]
|
||||
|
||||
|
||||
@ -7,11 +7,6 @@
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
MOZ_GLUE_PROGRAM_LDFLAGS =
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../common \
|
||||
-I$(topsrcdir)/xpcom/glue \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone)
|
||||
else
|
||||
|
||||
@ -54,6 +54,12 @@ DEFINES['NS_NO_XPCOM'] = True
|
||||
for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'):
|
||||
DEFINES[var] = '"%s"' % CONFIG[var]
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../common',
|
||||
'/xpcom/glue',
|
||||
]
|
||||
|
||||
|
||||
DELAYLOAD_DLLS += [
|
||||
'crypt32.dll',
|
||||
'userenv.dll',
|
||||
|
||||
@ -13,8 +13,6 @@ EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_DBUS_GLIB_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += \
|
||||
|
||||
@ -30,3 +30,8 @@ FAIL_ON_WARNINGS = True
|
||||
IS_COMPONENT = True
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/components/build/',
|
||||
]
|
||||
|
||||
|
||||
@ -16,16 +16,6 @@ endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/testing/gtest/mozilla \
|
||||
-I$(srcdir)/../profile \
|
||||
-I$(topsrcdir)/dom/ipc \
|
||||
-I$(topsrcdir)/toolkit/crashreporter \
|
||||
-I$(topsrcdir)/dom/base \
|
||||
-I$(topsrcdir)/xpcom/build \
|
||||
-I$(topsrcdir)/config \
|
||||
$(NULL)
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
|
||||
|
||||
ifdef MOZ_WIDGET_GTK
|
||||
|
||||
@ -143,3 +143,14 @@ for var in ('APP_VERSION', 'APP_ID'):
|
||||
|
||||
if CONFIG['MOZILLA_OFFICIAL']:
|
||||
DEFINES['MOZILLA_OFFICIAL'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../profile',
|
||||
'/config',
|
||||
'/dom/base',
|
||||
'/dom/ipc',
|
||||
'/testing/gtest/mozilla',
|
||||
'/toolkit/crashreporter',
|
||||
'/xpcom/build',
|
||||
]
|
||||
|
||||
|
||||
@ -4,12 +4,6 @@
|
||||
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir) \
|
||||
-I$(topsrcdir)/toolkit/xre \
|
||||
-I$(topsrcdir)/config \
|
||||
$(NULL)
|
||||
|
||||
MOZ_WINCONSOLE = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -15,4 +15,10 @@ SOURCES += [
|
||||
|
||||
DEFINES['NS_NO_XPCOM'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/config',
|
||||
'/toolkit/xre',
|
||||
]
|
||||
|
||||
|
||||
USE_STATIC_LIBS = True
|
||||
|
||||
@ -3,15 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
|
||||
-I$(topsrcdir)/dom/events \
|
||||
-I$(topsrcdir)/dom/ipc \
|
||||
-I$(topsrcdir)/content/base/src \
|
||||
-I$(topsrcdir)/netwerk/base/src \
|
||||
-I$(topsrcdir)/netwerk/protocol/http
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||
LOCAL_INCLUDES += -I$(srcdir)/win
|
||||
endif
|
||||
|
||||
@ -136,3 +136,13 @@ FAIL_ON_WARNINGS = True
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/content/base/src',
|
||||
'/dom/base',
|
||||
'/dom/events',
|
||||
'/dom/ipc',
|
||||
'/netwerk/base/src',
|
||||
'/netwerk/protocol/http',
|
||||
]
|
||||
|
||||
|
||||
@ -1,13 +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/.
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/content/base/src \
|
||||
-I$(topsrcdir)/dom/events \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# vim: ts=4 sw=4 noexpandtab
|
||||
@ -42,3 +42,9 @@ FAIL_ON_WARNINGS = True
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/content/base/src',
|
||||
'/dom/events',
|
||||
]
|
||||
|
||||
|
||||
@ -10,13 +10,6 @@ DEFINES += -DAB_CD=$(AB_CD)
|
||||
|
||||
STL_FLAGS=
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/toolkit/xre \
|
||||
-I$(topsrcdir)/toolkit/profile \
|
||||
-I$(topsrcdir)/xpcom/base \
|
||||
-I$(topsrcdir)/xpcom/build \
|
||||
$(NULL)
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
TK_LIBS := -framework Cocoa $(TK_LIBS)
|
||||
endif
|
||||
|
||||
@ -17,3 +17,11 @@ DEFINES['XPCOM_GLUE'] = True
|
||||
|
||||
if CONFIG['TARGET_XPCOM_ABI']:
|
||||
DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI']
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/toolkit/profile',
|
||||
'/toolkit/xre',
|
||||
'/xpcom/base',
|
||||
'/xpcom/build',
|
||||
]
|
||||
|
||||
|
||||
@ -5,11 +5,6 @@
|
||||
# Don't create a dependency on mozglue
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/xpcom/build \
|
||||
-I$(topsrcdir)/xpcom/base \
|
||||
$(NULL)
|
||||
|
||||
STL_FLAGS=
|
||||
|
||||
LIBS = \
|
||||
|
||||
@ -19,5 +19,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
|
||||
DEFINES['XPCOM_GLUE'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/xpcom/base',
|
||||
'/xpcom/build',
|
||||
]
|
||||
|
||||
|
||||
# Statically link against the RTL on windows
|
||||
USE_STATIC_LIBS = True
|
||||
|
||||
Loading…
Reference in New Issue
Block a user