Bug 742107 - Use GRE_HOME or /system/b2g on Gonk, r=glandium

xpcom/build/BinaryPath.h

@@ -94,12 +94,17 @@ private:
     return rv;
   }
 
-#elif defined(MOZ_WIDGET_ANDROID)
+#elif defined(ANDROID)
   static nsresult Get(const char *argv0, char aResult[MAXPATHLEN])
   {
     // On Android, we use the GRE_HOME variable that is set by the Java
     // bootstrap code.
     const char *greHome = getenv("GRE_HOME");
+#if defined(MOZ_WIDGET_GONK)
+    if (!greHome)
+      greHome = "/system/b2g";
+#endif
+
     if (!greHome)
       return NS_ERROR_FAILURE;