Bug 824330 - Build services/ during the platform tier and enable services in xulrunner. r=blassey,r=bsmedberg,r=gps

This commit is contained in:
Mike Hommey 2013-01-04 15:56:20 +01:00
parent f36d3dfedd
commit 5a817fd43d
7 changed files with 9 additions and 12 deletions

View File

@ -18,8 +18,6 @@ ifdef MOZ_EXTENSIONS
tier_app_dirs += extensions
endif
tier_app_dirs += services
tier_app_dirs += \
$(MOZ_BRANDING_DIRECTORY) \
b2g \

View File

@ -14,8 +14,6 @@ endif
tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
tier_app_dirs += services
ifdef MOZ_WEBAPP_RUNTIME
tier_app_dirs += webapprt
endif

View File

@ -19,9 +19,6 @@ MOZ_DISABLE_DOMCRYPTO=1
# Enable getUserMedia
MOZ_MEDIA_NAVIGATOR=1
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_METRICS=1
if test "$LIBXUL_SDK"; then
MOZ_XULRUNNER=1
else

View File

@ -21,10 +21,6 @@ ifdef MOZ_EXTENSIONS
tier_app_dirs += extensions
endif
ifdef MOZ_SERVICES_SYNC
tier_app_dirs += services
endif
tier_app_dirs += \
$(MOZ_BRANDING_DIRECTORY) \
mobile/xul \

View File

@ -22,4 +22,6 @@ INSTALL_TARGETS += CRYPTO_MODULE
TEST_DIRS += tests
DIRS += component
include $(topsrcdir)/config/rules.mk

View File

@ -260,7 +260,7 @@ ifdef MOZ_PREF_EXTENSIONS
tier_platform_dirs += extensions/pref
endif
tier_platform_dirs += services/crypto/component
tier_platform_dirs += services
tier_platform_dirs += startupcache

View File

@ -12,3 +12,9 @@ MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_PLACES=1
MOZ_EXTENSIONS_DEFAULT=" gio"
MOZ_URL_CLASSIFIER=1
MOZ_SERVICES_AITC=1
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_CRYPTO=1
MOZ_SERVICES_METRICS=1
MOZ_SERVICES_NOTIFICATIONS=1
MOZ_SERVICES_SYNC=1