diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp index bd16225320a3..9e319079bd4f 100644 --- a/ipc/glue/GeckoChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -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& 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(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& 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, diff --git a/mozglue/android/APKOpen.cpp b/mozglue/android/APKOpen.cpp index a60609481f83..c43a7fbb859f 100644 --- a/mozglue/android/APKOpen.cpp +++ b/mozglue/android/APKOpen.cpp @@ -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); diff --git a/mozglue/android/APKOpen.h b/mozglue/android/APKOpen.h index 23c407eace6e..dcab69e9f6c6 100644 --- a/mozglue/android/APKOpen.h +++ b/mozglue/android/APKOpen.h @@ -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 */