mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor, make lo-bootstrap API usable from non-NativeActivity apps too

Browse Source
This commit is contained in:
Tor Lillqvist
2011-11-29 01:19:57 +02:00
parent 406947c633
commit 203553e717
2 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sal/osl/android/jni/lo-bootstrap.c
View File

@@ -293,14 +293,14 @@ Java_org_libreoffice_android_Bootstrap_dlcall(JNIEnv* env,
return 0;
}
// public native boolean setup(String dataDir,
// String apkFile,
// String[] ld_library_path);
// public static native boolean setup(String dataDir,
// String apkFile,
// String[] ld_library_path);
jboolean
Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_String_2_3Ljava_lang_String_2
(JNIEnv* env,
jobject this,
jobject clazz,
jstring dataDir,
jstring apkFile,
jobjectArray ld_library_path)
@@ -365,13 +365,13 @@ Java_org_libreoffice_android_Bootstrap_setup__Ljava_lang_String_2Ljava_lang_Stri
return JNI_TRUE;
}
// public native boolean setup(int lo_main_ptr,
// Object lo_main_argument,
// int lo_main_delay);
// public statuc native boolean setup(int lo_main_ptr,
// Object lo_main_argument,
// int lo_main_delay);
jboolean
Java_org_libreoffice_android_Bootstrap_setup__ILjava_lang_Object_2I(JNIEnv* env,
jobject this,
jobject clazz,
void *lo_main_ptr,
jobject lo_main_argument,
jint lo_main_delay)
@@ -983,6 +983,29 @@ patch(const char *symbol,
((((int) replacement_code - ((int) code + 8)) / 4) & 0x00FFFFFF));
}
static void
patch_libgnustl_shared(void)
{
patch("_ZNKSt9type_infoeqERKS_",
"std::type_info::operator==",
expected_operator_equals_r7_code,
sizeof(expected_operator_equals_r7_code),
&replacement_operator_equals_arm);
patch("_ZNKSt9type_info6beforeERKS_",
"std::type_info::before()",
expected_method_before_r7_code,
sizeof(expected_method_before_r7_code),
&replacement_method_before_arm);
}
void
Java_org_libreoffice_android_Bootstrap_patch_libgnustl_shared(JNIEnv* env,
jobject clazz)
{
patch_libgnustl_shared();
}
JavaVM *
lo_get_javavm(void)
{
@@ -1008,17 +1031,7 @@ android_main(struct android_app* state)
if (sleep_time != 0)
sleep(sleep_time);
patch("_ZNKSt9type_infoeqERKS_",
"std::type_info::operator==",
expected_operator_equals_r7_code,
sizeof(expected_operator_equals_r7_code),
&replacement_operator_equals_arm);
patch("_ZNKSt9type_info6beforeERKS_",
"std::type_info::before()",
expected_method_before_r7_code,
sizeof(expected_method_before_r7_code),
&replacement_method_before_arm);
patch_libgnustl_shared();
lo_main(lo_main_argc, lo_main_argv);

42
sal/osl/android/src/org/libreoffice/android/Bootstrap.java
View File

@@ -28,6 +28,7 @@
package org.libreoffice.android;
import android.app.Activity;
import android.app.NativeActivity;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -46,13 +47,13 @@ public class Bootstrap extends NativeActivity
{
private static String TAG = "lo-bootstrap";
public native boolean setup(String dataDir,
String apkFile,
String[] ld_library_path);
private static native boolean setup(String dataDir,
String apkFile,
String[] ld_library_path);
public native boolean setup(int lo_main_ptr,
Object lo_main_argument,
int lo_main_delay);
public static native boolean setup(int lo_main_ptr,
Object lo_main_argument,
int lo_main_delay);
// This is not just a wrapper for the C library dlopen(), but also
// loads recursively dependent libraries.
@@ -61,27 +62,23 @@ public class Bootstrap extends NativeActivity
// This is just a wrapper for the C library dlsym().
public static native int dlsym(int handle, String symbol);
// To be called after you are sure libgnustl_shared.so
// has been loaded
public static native void patch_libgnustl_shared();
// Wrapper for getpid()
public static native int getpid();
// Wrapper for system()
public static native void system(String cmdline);
@Override
protected void onCreate(Bundle savedInstanceState)
public static void setup(Activity activity)
{
String dataDir = null;
try {
ApplicationInfo ai = this.getPackageManager().getApplicationInfo
("org.libreoffice.android",
PackageManager.GET_META_DATA);
dataDir = ai.dataDir;
Log.i(TAG, String.format("dataDir=%s\n", dataDir));
}
catch (PackageManager.NameNotFoundException e) {
return;
}
ApplicationInfo ai = activity.getApplicationInfo();
dataDir = ai.dataDir;
Log.i(TAG, String.format("dataDir=%s\n", dataDir));
String llp = System.getenv("LD_LIBRARY_PATH");
if (llp == null)
@@ -89,9 +86,16 @@ public class Bootstrap extends NativeActivity
String[] llpa = llp.split(":");
if (!setup(dataDir, getApplication().getPackageResourcePath(), llpa))
if (!setup(dataDir, activity.getApplication().getPackageResourcePath(), llpa))
return;
}
@Override
protected void onCreate(Bundle savedInstanceState)
{
setup(this);
String mainLibrary = getIntent().getStringExtra("lo-main-library");
if (mainLibrary == null)