Avoid OsLib setenv. It is not implemented in 4.2.2

Create a jni function to call setenv
he-sk · Jul 19, 2014 · a171071 · a171071
1 parent aea3490
commit a171071
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 19 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.clpeak"
     android:versionCode="1"

diff --git a/android/src/kr/clpeak/MainActivity.java b/android/src/kr/clpeak/MainActivity.java
@@ -20,11 +20,17 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+
 import kr.clpeak.jni_connect;
-import libcore.io.*;
 
 public class MainActivity extends Activity {
 
+	public native void setenv(String key, String value);
+
+	static {
+        System.loadLibrary("clpeak");
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     	super.onCreate(savedInstanceState);
@@ -132,7 +138,7 @@ public void onClick(DialogInterface dialog, int id)
 						return;
 					}
 				}
-				Libcore.os.setenv("LIBOPENCL_SO_PATH", libopenclSoPaths.get(arg2), true);
+				setenv("LIBOPENCL_SO_PATH", libopenclSoPaths.get(arg2));
 			}
 
 			@Override

diff --git a/android/src/kr/clpeak/jni_connect.java b/android/src/kr/clpeak/jni_connect.java
@@ -13,10 +13,6 @@ public class jni_connect extends AsyncTask<Integer, String, Integer>
 
 	public native int launchClpeak(int argc, String[] argv);
 
-	static {
-        System.loadLibrary("clpeak");
-    }
-
 	jni_connect(Activity _activity)
 	{
 		rootActivity = _activity;

diff --git a/android/src/libcore/io/Libcore.java b/android/src/libcore/io/Libcore.java
diff --git a/android/src/libcore/io/Os.java b/android/src/libcore/io/Os.java
diff --git a/src/entry_android.cpp b/src/entry_android.cpp
@@ -28,3 +28,11 @@ jint JNICALL Java_kr_clpeak_jni_1connect_launchClpeak(JNIEnv *_jniEnv,
 
 	return clObj.runAll();
 }
+
+
+void Java_kr_clpeak_MainActivity_setenv(JNIEnv *jniEnv,
+						jobject _jObj, jstring key, jstring value)
+{
+	setenv((char*) jniEnv->GetStringUTFChars(key, 0),
+			(char*) jniEnv->GetStringUTFChars(value, 0), 1);
+}
diff --git a/src/include/jni_entry.h b/src/include/jni_entry.h