зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1056941 - Remove extract libs parameter; r=glandium
This commit is contained in:
Родитель
b3d78f3a71
Коммит
8117b170c6
|
@ -249,7 +249,7 @@ public final class GeckoLoader {
|
|||
|
||||
loadMozGlue(context);
|
||||
loadLibsSetup(context);
|
||||
loadSQLiteLibsNative(apkName, false);
|
||||
loadSQLiteLibsNative(apkName);
|
||||
}
|
||||
|
||||
public static void loadNSSLibs(final Context context, final String apkName) {
|
||||
|
@ -262,7 +262,7 @@ public final class GeckoLoader {
|
|||
|
||||
loadMozGlue(context);
|
||||
loadLibsSetup(context);
|
||||
loadNSSLibsNative(apkName, false);
|
||||
loadNSSLibsNative(apkName);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -537,6 +537,6 @@ public final class GeckoLoader {
|
|||
// These methods are implemented in mozglue/android/APKOpen.cpp
|
||||
public static native void nativeRun(String args);
|
||||
private static native void loadGeckoLibsNative(String apkName);
|
||||
private static native void loadSQLiteLibsNative(String apkName, boolean shouldExtract);
|
||||
private static native void loadNSSLibsNative(String apkName, boolean shouldExtract);
|
||||
private static native void loadSQLiteLibsNative(String apkName);
|
||||
private static native void loadNSSLibsNative(String apkName);
|
||||
}
|
||||
|
|
|
@ -317,11 +317,7 @@ Java_org_mozilla_gecko_mozglue_GeckoLoader_loadGeckoLibsNative(JNIEnv *jenv, jcl
|
|||
}
|
||||
|
||||
extern "C" NS_EXPORT void JNICALL
|
||||
Java_org_mozilla_gecko_mozglue_GeckoLoader_loadSQLiteLibsNative(JNIEnv *jenv, jclass jGeckoAppShellClass, jstring jApkName, jboolean jShouldExtract) {
|
||||
if (jShouldExtract) {
|
||||
putenv("MOZ_LINKER_EXTRACT=1");
|
||||
}
|
||||
|
||||
Java_org_mozilla_gecko_mozglue_GeckoLoader_loadSQLiteLibsNative(JNIEnv *jenv, jclass jGeckoAppShellClass, jstring jApkName) {
|
||||
const char* str;
|
||||
// XXX: java doesn't give us true UTF8, we should figure out something
|
||||
// better to do here
|
||||
|
@ -339,11 +335,7 @@ Java_org_mozilla_gecko_mozglue_GeckoLoader_loadSQLiteLibsNative(JNIEnv *jenv, jc
|
|||
}
|
||||
|
||||
extern "C" NS_EXPORT void JNICALL
|
||||
Java_org_mozilla_gecko_mozglue_GeckoLoader_loadNSSLibsNative(JNIEnv *jenv, jclass jGeckoAppShellClass, jstring jApkName, jboolean jShouldExtract) {
|
||||
if (jShouldExtract) {
|
||||
putenv("MOZ_LINKER_EXTRACT=1");
|
||||
}
|
||||
|
||||
Java_org_mozilla_gecko_mozglue_GeckoLoader_loadNSSLibsNative(JNIEnv *jenv, jclass jGeckoAppShellClass, jstring jApkName) {
|
||||
const char* str;
|
||||
// XXX: java doesn't give us true UTF8, we should figure out something
|
||||
// better to do here
|
||||
|
|
Загрузка…
Ссылка в новой задаче