Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 837862: Remove the MOZ_PSM build option, r=gps

Browse Source 
--HG--
extra : rebase_source : 61403d908f5507d2b5b69894efc28a8a2e2abbd0
This commit is contained in:
Brian Smith 2013-07-01 18:35:20 -07:00
parent 2cc3aac4b8
commit 4f6c3f54d8
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@ -4289,7 +4289,6 @@ MOZ_PLACES=1
MOZ_SOCIAL=1
MOZ_PREF_EXTENSIONS=1
MOZ_PROFILELOCKING=1
MOZ_PSM=1
MOZ_REFLOW_PERF=
MOZ_SAFE_BROWSING=
MOZ_HELP_VIEWER=
@ -5284,14 +5283,6 @@ if test -n "$MOZ_ANDROID_BEAM"; then
AC_DEFINE(MOZ_ANDROID_BEAM)
fi
dnl ========================================================
dnl = Build Personal Security Manager
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(crypto,
[ --disable-crypto Disable crypto support (Personal Security Manager)],
MOZ_PSM=,
MOZ_PSM=1 )
dnl ========================================================
dnl = JS Debugger XPCOM component (js/jsd)
dnl ========================================================
@ -8633,7 +8624,6 @@ AC_SUBST(MOZ_AUTH_EXTENSION)
AC_SUBST(MOZ_PERMISSIONS)
AC_SUBST(MOZ_PREF_EXTENSIONS)
AC_SUBST(MOZ_JS_LIBS)
AC_SUBST(MOZ_PSM)
AC_SUBST(MOZ_DEBUG)
AC_SUBST(MOZ_DEBUG_SYMBOLS)
AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)

4
toolkit/locales/Makefile.in
View File

@ -27,9 +27,7 @@ endif
libs-%:
@$(MAKE) -C ../../netwerk/locales/ libs AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$*
ifdef MOZ_PSM
@$(MAKE) -C ../../security/manager/locales/ libs AB_CD=$* XPI_NAME=locale-$*
endif
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$*
# target to be used by multi-locale l10n builds, just add this locale
@ -37,9 +35,7 @@ endif
chrome-%:
@$(MAKE) -C $(DEPTH)/netwerk/locales/ chrome AB_CD=$*
@$(MAKE) -C $(DEPTH)/dom/locales/ chrome AB_CD=$*
ifdef MOZ_PSM
@$(MAKE) -C $(DEPTH)/security/manager/locales/ chrome AB_CD=$*
endif
@$(MAKE) chrome AB_CD=$*
ifdef MOZ_UPDATER

10
toolkit/toolkit.mozbuild
View File

@ -12,7 +12,7 @@ if not CONFIG['MOZ_NATIVE_NSPR']:
if not CONFIG['MOZ_NATIVE_SQLITE']:
add_tier_dir('nss', 'db/sqlite3/src')
if CONFIG['MOZ_PSM'] and not CONFIG['MOZ_NATIVE_NSS']:
if not CONFIG['MOZ_NATIVE_NSS']:
add_tier_dir('nss', 'security/build')
include('/config/js/js.mozbuild')
@ -176,13 +176,7 @@ if CONFIG['MOZ_ENABLE_XREMOTE']:
if CONFIG['MOZ_SPELLCHECK']:
add_tier_dir('platform', 'extensions/spellcheck')
if CONFIG['MOZ_PSM']:
add_tier_dir('platform', 'security/manager')
else:
add_tier_dir('platform', [
'security/manager/boot/public',
'security/manager/ssl/public',
])
add_tier_dir('platform', 'security/manager')
if CONFIG['MOZ_UPDATER']:
add_tier_dir('platform', 'modules/libmar')