mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
--HG-- rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
This commit is contained in:
parent
38a01c5f30
commit
97bf467204
@ -484,6 +484,8 @@
|
||||
@BINPATH@/components/WeaveCrypto.manifest
|
||||
@BINPATH@/components/WeaveCrypto.js
|
||||
#endif
|
||||
@BINPATH@/components/servicesComponents.manifest
|
||||
@BINPATH@/components/cryptoComponents.manifest
|
||||
#ifdef MOZ_SERVICES_HEALTHREPORT
|
||||
@BINPATH@/components/HealthReportComponents.manifest
|
||||
@BINPATH@/components/HealthReportService.js
|
||||
|
@ -477,6 +477,8 @@
|
||||
@BINPATH@/components/SyncComponents.manifest
|
||||
@BINPATH@/components/Weave.js
|
||||
#endif
|
||||
@BINPATH@/components/servicesComponents.manifest
|
||||
@BINPATH@/components/cryptoComponents.manifest
|
||||
@BINPATH@/components/TelemetryPing.js
|
||||
@BINPATH@/components/TelemetryPing.manifest
|
||||
@BINPATH@/components/messageWakeupService.js
|
||||
|
@ -434,6 +434,8 @@
|
||||
@BINPATH@/components/WeaveCrypto.manifest
|
||||
@BINPATH@/components/WeaveCrypto.js
|
||||
#endif
|
||||
@BINPATH@/components/servicesComponents.manifest
|
||||
@BINPATH@/components/cryptoComponents.manifest
|
||||
#ifdef MOZ_SERVICES_HEALTHREPORT
|
||||
@BINPATH@/components/HealthReportComponents.manifest
|
||||
@BINPATH@/components/HealthReportService.js
|
||||
|
@ -30,6 +30,10 @@ testing_modules := \
|
||||
utils.js \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_COMPONENTS := \
|
||||
servicesComponents.manifest \
|
||||
$(NULL)
|
||||
|
||||
TEST_DIRS += tests
|
||||
|
||||
PREF_JS_EXPORTS = $(srcdir)/services-common.js
|
||||
|
2
services/common/servicesComponents.manifest
Normal file
2
services/common/servicesComponents.manifest
Normal file
@ -0,0 +1,2 @@
|
||||
# Register resource aliases
|
||||
resource services-common resource://gre/modules/services-common/
|
@ -16,6 +16,10 @@ modules := \
|
||||
|
||||
MODULE = services-crypto
|
||||
|
||||
EXTRA_COMPONENTS := \
|
||||
cryptoComponents.manifest \
|
||||
$(NULL)
|
||||
|
||||
CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules))
|
||||
CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto
|
||||
INSTALL_TARGETS += CRYPTO_MODULE
|
||||
|
1
services/crypto/cryptoComponents.manifest
Normal file
1
services/crypto/cryptoComponents.manifest
Normal file
@ -0,0 +1 @@
|
||||
resource services-crypto resource://gre/modules/services-crypto/
|
@ -57,7 +57,11 @@ WeaveCrypto.prototype = {
|
||||
this.prefBranch = Services.prefs.getBranch("services.sync.log.");
|
||||
this.prefBranch.addObserver("cryptoDebug", this.observer, false);
|
||||
this.observer._self = this;
|
||||
this.debug = this.prefBranch.getBoolPref("cryptoDebug");
|
||||
try {
|
||||
this.debug = this.prefBranch.getBoolPref("cryptoDebug");
|
||||
} catch (x) {
|
||||
this.debug = false;
|
||||
}
|
||||
|
||||
this.initNSS();
|
||||
this.initAlgorithmSettings(); // Depends on NSS.
|
||||
|
@ -23,5 +23,3 @@ contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4
|
||||
# Register resource aliases
|
||||
# (Note, for tests these are also set up in addResourceAlias)
|
||||
resource services-sync resource://gre/modules/services-sync/
|
||||
resource services-common resource://gre/modules/services-common/
|
||||
resource services-crypto resource://gre/modules/services-crypto/
|
||||
|
Loading…
Reference in New Issue
Block a user