corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 732069 - Remove library extraction from APKOpen. r=glandium,blassey

Browse Source 
* * *
Bug 718760 - Fix bustage by removing extra apk_mtime variable. r=glandium
This commit is contained in:
Wes Johnston
2012-03-08 10:25:44 -08:00
parent 26f45e65a5
commit ac9835e7d9
4 changed files with 12 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mobile/android/base/GeckoAppShell.java
View File

@@ -141,8 +141,8 @@ public class GeckoAppShell
public static native void callObserver(String observerKey, String topic, String data);
public static native void removeObserver(String observerKey);
public static native void loadGeckoLibsNative(String apkName);
public static native void loadSQLiteLibsNative(String apkName, boolean shouldExtract);
public static native void loadNSSLibsNative(String apkName, boolean shouldExtract);
public static native void loadSQLiteLibsNative(String apkName);
public static native void loadNSSLibsNative(String apkName);
public static native void onChangeNetworkLinkStatus(String status);
public static void registerGlobalExceptionHandler() {
@@ -267,15 +267,6 @@ public class GeckoAppShell
File cacheFile = getCacheDir(context);
putenv("GRE_HOME=" + getGREDir(context).getPath());
File[] files = cacheFile.listFiles();
if (files != null) {
Iterator<File> cacheFiles = Arrays.asList(files).iterator();
while (cacheFiles.hasNext()) {
File libFile = cacheFiles.next();
if (libFile.getName().endsWith(".so"))
libFile.delete();
}
}
// setup the libs cache
String linkerCache = System.getenv("MOZ_LINKER_CACHE");
@@ -368,7 +359,7 @@ public class GeckoAppShell
loadMozGlue();
// the extract libs parameter is being removed in bug 732069
loadLibsSetup(context);
loadSQLiteLibsNative(apkName, false);
loadSQLiteLibsNative(apkName);
sSQLiteLibsLoaded = true;
}
}
@@ -381,7 +372,7 @@ public class GeckoAppShell
return;
loadMozGlue();
loadLibsSetup(context);
loadNSSLibsNative(apkName, false);
loadNSSLibsNative(apkName);
sNSSLibsLoaded = true;
}
}