Bug 817955 - Only install identity modules in modules/identity. r=benadida,r=jparsons

--HG--
extra : rebase_source : 027b0cae0a29d00c34424e542fe4d57192aab5b1

b2g/components/SignInToWebsite.jsm

@@ -76,7 +76,7 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/IdentityUtils.jsm");
+Cu.import("resource://gre/modules/identity/IdentityUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "IdentityService",
                                   "resource://gre/modules/identity/MinimalIdentity.jsm");

dom/identity/DOMIdentity.jsm

@@ -11,7 +11,7 @@ this.EXPORTED_SYMBOLS = ["DOMIdentity"];
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/IdentityUtils.jsm");
+Cu.import("resource://gre/modules/identity/IdentityUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "IdentityService",
 #ifdef MOZ_B2G_VERSION

dom/identity/nsDOMIdentity.js

@@ -16,7 +16,7 @@ const MAX_RP_CALLS = 100;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/IdentityUtils.jsm");
+Cu.import("resource://gre/modules/identity/IdentityUtils.jsm");
 
 // This is the child process corresponding to nsIDOMIdentity
 XPCOMUtils.defineLazyServiceGetter(this, "cpmm",

toolkit/identity/Makefile.in

@@ -41,12 +41,10 @@ EXTRA_JS_MODULES = \
 	Sandbox.jsm \
 	$(NULL)
 
+JS_MODULES_PATH = $(FINAL_TARGET)/modules/identity
+
 ifdef ENABLE_TESTS
     DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) -D $(FINAL_TARGET)/modules/identity
-	$(NSINSTALL) -R $(srcdir)/*.jsm $(FINAL_TARGET)/modules/identity

toolkit/identity/tests/unit/test_crypto_service.js

@@ -5,7 +5,7 @@
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import('resource://gre/modules/LogUtils.jsm');
+Cu.import('resource://gre/modules/identity/LogUtils.jsm');
 
 const idService = Cc["@mozilla.org/identity/crypto-service;1"]
                     .getService(Ci.nsIIdentityCryptoService);

toolkit/identity/tests/unit/test_jwcrypto.js

@@ -3,7 +3,7 @@
 
 "use strict"
 
-Cu.import('resource://gre/modules/LogUtils.jsm');
+Cu.import('resource://gre/modules/identity/LogUtils.jsm');
 
 XPCOMUtils.defineLazyModuleGetter(this, "IDService",
                                   "resource://gre/modules/identity/Identity.jsm",