Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 859763 - Remove more remains of the old linker. r=blassey

Browse Source
This commit is contained in:
Mike Hommey 2013-04-10 09:02:32 +02:00
parent db0e799a83
commit aaed6c5d7f
3 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ipc/glue/GeckoChildProcessHost.cpp
View File

@ -37,10 +37,6 @@
#define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
#endif
#ifdef MOZ_WIDGET_ANDROID
#include "APKOpen.h"
#endif
using mozilla::MonitorAutoLock;
using mozilla::ipc::GeckoChildProcessHost;
@ -560,20 +556,6 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
#ifdef MOZ_WIDGET_ANDROID
// The java wrapper unpacks this for us but can't make it executable
chmod(exePath.value().c_str(), 0700);
int cacheCount = 0;
const struct lib_cache_info * cache = getLibraryCache();
nsCString cacheStr;
while (cache &&
cacheCount++ < MAX_LIB_CACHE_ENTRIES &&
strlen(cache->name)) {
mFileMap.push_back(std::pair<int,int>(cache->fd, cache->fd));
cacheStr.Append(cache->name);
cacheStr.AppendPrintf(":%d;", cache->fd);
cache++;
}
// fill the last arg with something if there's no cache
if (cacheStr.IsEmpty())
cacheStr.AppendLiteral("-");
#endif // MOZ_WIDGET_ANDROID
#ifdef ANDROID
@ -668,10 +650,6 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
childArgv.push_back(childProcessType);
#ifdef MOZ_WIDGET_ANDROID
childArgv.push_back(cacheStr.get());
#endif
base::LaunchApp(childArgv, mFileMap,
#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
newEnvVars, privs,

11
mozglue/android/APKOpen.cpp
View File

@ -121,14 +121,6 @@ xul_dlsym(const char *symbolName, T *value)
*value = (T) (uintptr_t) __wrap_dlsym(xul_handle, symbolName);
}
static struct lib_cache_info *cache_mapping = NULL;
NS_EXPORT const struct lib_cache_info *
getLibraryCache()
{
return cache_mapping;
}
static int mapping_count = 0;
#define MAX_MAPPING_INFO 32
@ -378,9 +370,6 @@ ChildProcessInit(int argc, char* argv[])
return FAILURE;
}
// don't pass the last arg - it's only recognized by the lib cache
argc--;
GeckoProcessType (*fXRE_StringToChildProcessType)(char*);
xul_dlsym("XRE_StringToChildProcessType", &fXRE_StringToChildProcessType);

13
mozglue/android/APKOpen.h
View File

@ -24,17 +24,4 @@ static const int SUCCESS = 0;
static const int FAILURE = 1;
void JNI_Throw(JNIEnv* jenv, const char* classname, const char* msg);
#define MAX_LIB_CACHE_ENTRIES 32
#define MAX_LIB_CACHE_NAME_LEN 32
struct lib_cache_info {
char name[MAX_LIB_CACHE_NAME_LEN];
int fd;
uint32_t lib_size;
void* buffer;
};
NS_EXPORT const struct lib_cache_info * getLibraryCache();
#endif /* APKOpen_h */