bug 661282 - make xpcshell run on android, follow up to not requre --appomni r=bsmedberg
authorBrad Lassey <blassey@mozilla.com>
Wed, 27 Jul 2011 14:04:36 -0400
changeset 74198 d9456378c12dfd57040e4d58710fa2c9f9274839
parent 74197 187ac0d7b1540c0b512564a2a79eb2936d6774a1
child 74199 1baddb020156e90b5441631832407c8405a09a53
push id1122
push userblassey@mozilla.com
push dateWed, 10 Aug 2011 20:59:14 +0000
treeherdermozilla-inbound@d9456378c12d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs661282
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 661282 - make xpcshell run on android, follow up to not requre --appomni r=bsmedberg
js/src/xpconnect/shell/xpcshell.cpp
--- a/js/src/xpconnect/shell/xpcshell.cpp
+++ b/js/src/xpconnect/shell/xpcshell.cpp
@@ -1837,17 +1837,19 @@ main(int argc, char **argv, char **envp)
         if (argc > 1 && !strcmp(argv[1], "--greomni")) {
             nsCOMPtr<nsILocalFile> greOmni;
             nsCOMPtr<nsILocalFile> appOmni;
             XRE_GetFileFromPath(argv[2], getter_AddRefs(greOmni));
             if (argc > 3 && !strcmp(argv[3], "--appomni")) {
                 XRE_GetFileFromPath(argv[4], getter_AddRefs(appOmni));
                 argc-=2;
                 argv+=2;
-            } 
+            } else {
+                appOmni = greOmni;
+            }
             
             XRE_InitOmnijar(greOmni, appOmni);
             argc-=2;
             argv+=2;
         }
 
         nsCOMPtr<nsIServiceManager> servMan;
         rv = NS_InitXPCOM2(getter_AddRefs(servMan), appDir, &dirprovider);