Changeset 13931

Timestamp:

11/09/12 18:05:53 (12 years ago)

Author:

Eric.Larour

Message:

CHG: modified process to create ISSM app, using the autotools

Location:

issm/trunk-jpl/src/android/ISSM

Files:

• . (modified) (1 prop)
• Makefile.am (added)
• jni/Android.mk (modified) (1 diff)
• jni/Main.cpp (modified) (1 diff)
• jni/com_example_issm_FacLib.h (deleted)
• jni/com_example_issm_IssmJni.h (added)
• jni/issmlib/Android.mk (modified) (1 diff)
• obj (deleted)
• src/com/example/issm/ISSM.java (modified) (1 diff)
• src/com/example/issm/IssmJni.java (added)

issm/trunk-jpl/src/android/ISSM/jni/Android.mk

@@ -13 +13 @@
 LOCAL_CFLAGS := -Wno-psabi
 LOCAL_LDLIBS := -llog -ldl
-LOCAL_MODULE := FacLib
+LOCAL_MODULE := IssmJni
 LOCAL_SRC_FILES := Main.cpp 
 LOCAL_STATIC_LIBRARIES := libISSMCore

issm/trunk-jpl/src/android/ISSM/jni/Main.cpp

@@ -1 @@
-#include "./issmlib/include/fac.h"
-#include "com_example_issm_FacLib.h"
+#include "../../../c/android/fac.h"
+#include "com_example_issm_IssmJni.h"
 #include <cstddef>
 
-JNIEXPORT jlong JNICALL Java_com_example_issm_FacLib_fac(JNIEnv *env, jclass clazz, jlong n)
+JNIEXPORT jlong JNICALL Java_com_example_issm_IssmJni_fac(JNIEnv *env, jclass clazz, jlong n)
 {
         fac *f = new fac();

issm/trunk-jpl/src/android/ISSM/jni/issmlib/Android.mk

@@ -2 +2 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libISSMCore
-LOCAL_SRC_FILES := ../../../../../lib/libISSMCore.a
+LOCAL_SRC_FILES := ../../../../c/libISSMCore.a
 LOCAL_EXPORT_C_INCLUDES := ../../../../c/android/
 include $(PREBUILT_STATIC_LIBRARY)

issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java

@@ -34 +34 @@
                         return;
                 }
-                long result = FacLib.facIterative(Long.parseLong(input));
+                long result = IssmJni.facIterative(Long.parseLong(input));
                 this.output.setText("Result = " + result + "\n");
         }