Changeset 14370

Timestamp:

02/22/13 15:29:56 (12 years ago)

Author:

Eric.Larour

Message:

CHG: updated Makefile.am to skip NDK-BUILD

Location:

issm/trunk-jpl/src/android/ISSM

Files:

• Makefile.am (modified) (1 diff)
• src/gov/nasa/jpl/issm/IssmJni.java (modified) (1 diff)

issm/trunk-jpl/src/android/ISSM/Makefile.am

@@ -5 +5 @@
 
 libISSMJNI_la_SOURCES = ./jni/Main.cpp
-libISSMJNI_la_LIBADD = $(ISSM_DIR)/src/c/libISSMCore.a
+libISSMJNI_la_LIBADD = $(ISSM_DIR)/src/c/libISSMCore.a $(ISSM_DIR)/externalpackages/gsl/install/lib/libgsl.a

issm/trunk-jpl/src/android/ISSM/src/gov/nasa/jpl/issm/IssmJni.java

@@ -8 +8 @@
         static 
         {
-        System.loadLibrary("IssmJni");
+        System.loadLibrary("ISSMJNI");
     }
 }