diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2016-06-28 16:34:40 +0200 |
|---|---|---|
| committer | Ivo van Dongen <info@ivovandongen.nl> | 2016-07-07 10:08:43 +0200 |
| commit | 733c65b72d0b583e807ec81f44f14e5b45f9d82e (patch) | |
| tree | e4b9dd8b08d7739030281573bb62cdb989c3367a | |
| parent | 3981747815f80e5edb52b7604cd281e2c0b7ad81 (diff) | |
| download | qtlocation-mapboxgl-733c65b72d0b583e807ec81f44f14e5b45f9d82e.tar.gz | |
[android] #5456 - Fixed library path so that HTTPContext class is bound without issues
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | platform/android/src/jni.cpp | 2 | ||||
| -rw-r--r-- | test/src/Main.java | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -202,7 +202,7 @@ test-android: android-test-lib-arm-v7 adb push build/test.jar /data/local/tmp/ adb push build/android-arm-v7/Debug/lib.target/libmapbox-gl.so /data/local/tmp/ adb push build/android-arm-v7/Debug/lib.target/libtest-jni-lib.so /data/local/tmp/ - adb shell "LD_LIBRARY_PATH=/data/local/tmp dalvikvm32 -cp /data/local/tmp/test.jar Main" + adb shell "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/system/lib:/data/local/tmp dalvikvm32 -cp /data/local/tmp/test.jar Main" #TODO - Renable platform tests cd platform/android && ./gradlew testReleaseUnitTest --continue apackage: diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index 3b2f6b3625..311f97b3d9 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -1540,7 +1540,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { static mbgl::util::RunLoop mainRunLoop; - //XXX Need to figure out why this breaks everything mbgl::android::RegisterNativeHTTPRequest(env); + mbgl::android::RegisterNativeHTTPRequest(env); latLngClass = &jni::FindClass(env, "com/mapbox/mapboxsdk/geometry/LatLng"); latLngClass = jni::NewGlobalRef(env, latLngClass).release(); diff --git a/test/src/Main.java b/test/src/Main.java index 87f2a3949c..e20aa7db3f 100644 --- a/test/src/Main.java +++ b/test/src/Main.java @@ -2,10 +2,12 @@ public class Main { public native void runAllTests(); public static void main(String[] args) throws Exception { - //System.out.println(Class.forName("com.mapbox.mapboxsdk.geometry.LatLng")); + //Need to load the mapbox-gl library explicitly first System.loadLibrary("mapbox-gl"); + //Load the tests System.loadLibrary("test-jni-lib"); System.out.println("Libraries loaded"); + //Run the tests new Main().runAllTests(); } } |