Bug 552924 - Allow distinguishing Universal ppc/i386 from Universal i386/x86_64 builds in AUS request. r=dtownsend, a=blocking bug 519060

toolkit/mozapps/update/nsUpdateService.js

@@ -152,7 +152,7 @@ XPCOMUtils.defineLazyGetter(this, "gABI", function aus_gABI() {
                  getService(Ci.nsIMacUtils);
 
   if (macutils.isUniversalBinary)
-    abi = "Universal-gcc3";
+    abi += "-u-" + macutils.architecturesInBinary;
 #endif
   return abi;
 });

toolkit/mozapps/update/test/unit/test_0040_general.js

@@ -140,7 +140,7 @@ function check_test_pt4() {
                    getService(AUS_Ci.nsIMacUtils);
 
     if (macutils.isUniversalBinary)
-      abi = "Universal-gcc3";
+      abi += "-u-" + macutils.architecturesInBinary;
   }
 
   do_check_eq(getResult(gRequestURL), gAppInfo.OS + "_" + abi);