зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1651838 - Remove unused --appomni on Android. r=glandium,snorp
Differential Revision: https://phabricator.services.mozilla.com/D83195
This commit is contained in:
Родитель
553ba79763
Коммит
489dd44cdd
|
@ -1202,11 +1202,6 @@ bool PosixProcessLauncher::DoSetup() {
|
|||
mChildArgv.push_back("-greomni");
|
||||
mChildArgv.push_back(path.get());
|
||||
}
|
||||
file = Omnijar::GetPath(Omnijar::APP);
|
||||
if (file && NS_SUCCEEDED(file->GetNativePath(path))) {
|
||||
mChildArgv.push_back("-appomni");
|
||||
mChildArgv.push_back(path.get());
|
||||
}
|
||||
}
|
||||
# endif
|
||||
// Add the application directory path (-appdir path)
|
||||
|
|
|
@ -1185,17 +1185,8 @@ int XRE_XPCShellMain(int argc, char** argv, char** envp,
|
|||
|
||||
if (argc > 1 && !strcmp(argv[1], "--greomni")) {
|
||||
nsCOMPtr<nsIFile> greOmni;
|
||||
nsCOMPtr<nsIFile> 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);
|
||||
XRE_InitOmnijar(greOmni, greOmni);
|
||||
argc -= 2;
|
||||
argv += 2;
|
||||
}
|
||||
|
|
|
@ -4976,24 +4976,8 @@ nsresult XRE_InitCommandLine(int aArgc, char* aArgv[]) {
|
|||
return rv;
|
||||
}
|
||||
|
||||
ar = CheckArg("appomni", &path);
|
||||
if (ar == ARG_BAD) {
|
||||
PR_fprintf(PR_STDERR,
|
||||
"Error: argument --appomni requires a path argument\n");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIFile> appOmni;
|
||||
if (path) {
|
||||
rv = XRE_GetFileFromPath(path, getter_AddRefs(appOmni));
|
||||
if (NS_FAILED(rv)) {
|
||||
PR_fprintf(PR_STDERR,
|
||||
"Error: argument --appomni requires a valid path\n");
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
|
||||
mozilla::Omnijar::Init(greOmni, appOmni);
|
||||
mozilla::Omnijar::Init(greOmni, greOmni);
|
||||
#endif
|
||||
|
||||
return rv;
|
||||
|
|
Загрузка…
Ссылка в новой задаче