diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android-emacs.c | 11 | ||||
| -rw-r--r-- | src/android.c | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/android-emacs.c b/src/android-emacs.c index d68734da1bd..28b46ca1a4b 100644 --- a/src/android-emacs.c +++ b/src/android-emacs.c @@ -37,7 +37,7 @@ main (int argc, char **argv) { char **args; int i; - char *bootclasspath, *emacs_class_path, *ld_library_path; + char *bootclasspath, *emacs_class_path; /* Allocate enough to hold the arguments to app_process. */ args = alloca ((10 + argc) * sizeof *args); @@ -63,15 +63,6 @@ main (int argc, char **argv) return 1; } - /* Restore LD_LIBRARY_PATH to its original value, the app library - directory, to guarantee that it is possible for Java to find the - Emacs C code later. */ - - ld_library_path = getenv ("EMACS_LD_LIBRARY_PATH"); - - if (ld_library_path) - setenv ("LD_LIBRARY_PATH", ld_library_path, 1); - if (asprintf (&bootclasspath, "-Djava.class.path=%s", emacs_class_path) < 0) { diff --git a/src/android.c b/src/android.c index f90ebc04925..3c96867a6b5 100644 --- a/src/android.c +++ b/src/android.c @@ -1338,7 +1338,7 @@ NATIVE_NAME (setEmacsParams) (JNIEnv *env, jobject object, int pipefd[2]; pthread_t thread; - const char *java_string; + const char *java_string, *tem; struct stat statb; #ifdef THREADS_ENABLED @@ -1491,15 +1491,6 @@ NATIVE_NAME (setEmacsParams) (JNIEnv *env, jobject object, EmacsNoninteractive can be found. */ setenv ("EMACS_CLASS_PATH", android_class_path, 1); - /* Set LD_LIBRARY_PATH to an appropriate value. */ - setenv ("LD_LIBRARY_PATH", android_lib_dir, 1); - - /* EMACS_LD_LIBRARY_PATH records the location of the app library - directory. android-emacs refers to this, since users have valid - reasons for changing LD_LIBRARY_PATH to a value that precludes - the possibility of Java locating libemacs later. */ - setenv ("EMACS_LD_LIBRARY_PATH", android_lib_dir, 1); - /* If the system is Android 5.0 or later, set LANG to en_US.utf8, which is understood by the C library. In other instances set it to C, a meaningless value, for good measure. */ |