Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1256988 - Move MOZ_INSTRUMENT_EVENT_LOOP to moz.configure. r=chmanchester

Browse Source
This commit is contained in:
Mike Hommey 2016-03-16 16:19:03 +09:00
parent 9351ddacba
commit 42022dc1f2
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/moz.configure/init.configure
View File

@ -258,6 +258,7 @@ def wanted_mozconfig_variables(help):
'MOZILLABUILD',
'MOZ_ARTIFACT_BUILDS',
'MOZ_BUILD_APP',
'MOZ_INSTRUMENT_EVENT_LOOP',
'PERL',
'RPMBUILD',
'TAR',

19
old-configure.in
View File

@ -3413,20 +3413,12 @@ dnl ========================================================
case "$MOZ_WIDGET_TOOLKIT" in
windows)
MOZ_INSTRUMENT_EVENT_LOOP=1
;;
gtk3)
USE_FC_FREETYPE=1
MOZ_INSTRUMENT_EVENT_LOOP=1
;;
gtk2)
USE_FC_FREETYPE=1
MOZ_INSTRUMENT_EVENT_LOOP=1
;;
qt)
@ -3446,7 +3438,6 @@ cocoa)
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
MOZ_USER_DIR="Mozilla"
MOZ_FS_LAYOUT=bundle
MOZ_INSTRUMENT_EVENT_LOOP=1
;;
uikit)
@ -3459,22 +3450,13 @@ uikit)
MOZ_FS_LAYOUT=bundle
;;
android)
MOZ_INSTRUMENT_EVENT_LOOP=1
;;
gonk)
AC_DEFINE(MOZ_TOUCH)
MOZ_TOUCH=1
MOZ_INSTRUMENT_EVENT_LOOP=1
;;
esac
if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then
AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP)
fi
dnl there are a lot of tests on MOZ_ENABLE_GTK below, that are more convenient
dnl to keep that way than testing against MOZ_WIDGET_TOOLKIT
case "$MOZ_WIDGET_TOOLKIT" in
@ -8066,7 +8048,6 @@ AC_SUBST(VPX_AS_CONVERSION)
AC_SUBST(VPX_X86_ASM)
AC_SUBST(VPX_ARM_ASM)
AC_SUBST(VPX_NEED_OBJ_INT_EXTRACT)
AC_SUBST(MOZ_INSTRUMENT_EVENT_LOOP)
AC_SUBST(MOZ_CODE_COVERAGE)
AC_SUBST(LIBJPEG_TURBO_USE_YASM)
AC_SUBST_LIST(LIBJPEG_TURBO_ASFLAGS)

13
toolkit/moz.configure
View File

@ -120,3 +120,16 @@ def pdf_printing(toolkit):
else:
# CONFIGURE_SUBST_FILES need explicit empty values.
set_config('PDF_SURFACE_FEATURE', '')
# Event loop instrumentation
# ==============================================================
option(env='MOZ_INSTRUMENT_EVENT_LOOP',
help='Force-enable event loop instrumentation')
@depends('MOZ_INSTRUMENT_EVENT_LOOP', toolkit)
def instrument_event_loop(value, toolkit):
if value or (toolkit in ('windows', 'gtk2', 'gtk3', 'cocoa', 'android',
'gonk') and value.origin == 'default'):
set_config('MOZ_INSTRUMENT_EVENT_LOOP', '1')
set_define('MOZ_INSTRUMENT_EVENT_LOOP', '1')