Bug 1049249 - Remove app_libxul_dirs on a CLOSED TREE. r=jcranmer

This commit is contained in:
Mike Hommey 2014-08-07 13:39:20 +09:00
Родитель acefffbfc1
Коммит 7564c0d76c
4 изменённых файлов: 5 добавлений и 24 удалений

Просмотреть файл

@ -3,14 +3,12 @@
# 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/.
mailnews_dirs = []
if CONFIG['MOZ_LDAP_XPCOM']:
mailnews_dirs += ['../ldap']
mailnews_dirs += ['../ldap/xpcom']
add_tier_dir('app', '../ldap')
add_tier_dir('app', '../ldap/xpcom')
if CONFIG['MOZ_MORK']:
mailnews_dirs += ['../db']
add_tier_dir('app', '../db')
mailnews_dirs += ['../mailnews']
add_tier_dir('app', '../mailnews')

Просмотреть файл

@ -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/.
app_libxul_dirs = []
if not CONFIG['LIBXUL_SDK']:
include('/toolkit/toolkit.mozbuild')

Просмотреть файл

@ -3,20 +3,13 @@
# 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/.
app_libxul_dirs = []
include('../bridge/bridge.mozbuild')
if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
app_libxul_dirs = mailnews_dirs
app_libxul_dirs += ['../mail/components']
add_tier_dir('app', '../mail/components')
if not CONFIG['LIBXUL_SDK']:
include('/toolkit/toolkit.mozbuild')
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
add_tier_dir('app', mailnews_dirs)
if CONFIG['MOZ_EXTENSIONS']:
add_tier_dir('app', 'extensions')

Просмотреть файл

@ -3,19 +3,11 @@
# 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/.
app_libxul_dirs = []
include('../bridge/bridge.mozbuild')
if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
app_libxul_dirs = mailnews_dirs
if not CONFIG['LIBXUL_SDK']:
include('/toolkit/toolkit.mozbuild')
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
add_tier_dir('app', mailnews_dirs)
if CONFIG['MOZ_EXTENSIONS']:
add_tier_dir('app', 'extensions')