Changeset 14203 for issm/trunk-jpl/src

Timestamp:

12/20/12 13:26:20 (12 years ago)

Author:

ltnguyen

Message:

Fix: Make file for android

Location:

issm/trunk-jpl/src/android/ISSM/jni

Files:

• Android.mk (modified) (2 diffs)
• gsllib/Android.mk (modified) (1 diff)
• issmlib/Android.mk (modified) (1 diff)

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

@@ -2 +2 @@
 my_LOCAL_PATH:=$(LOCAL_PATH)
 
-#include $(LOCAL_PATH)/issmlib\Android.mk
 include $(call all-subdir-makefiles)
-
 
 LOCAL_PATH := $(my_LOCAL_PATH)
@@ -13 +11 @@
 LOCAL_CFLAGS := -Wno-psabi -DHAVE_CONFIG_H
 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog -ldl -lm
-#LOCAL_LDLIBS := -llog -ldl -lm
 LOCAL_MODULE := IssmJni
 LOCAL_SRC_FILES := Main.cpp 

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

@@ -1 +1 @@
 LOCAL_PATH:= $(call my-dir)
+my_directory:= $(LOCAL_PATH)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgsl
-LOCAL_SRC_FILES := libsgsl.a
+LOCAL_SRC_FILES := ../../../../../externalpackages/gsl/install/lib/libgsl.a
 LOCAL_EXPORT_C_INCLUDES := $(ISSM_DIR)/externalpackages/gsl/install/include/gsl/
 include $(PREBUILT_STATIC_LIBRARY)
 
-#include $(CLEAR_VARS)
-#LOCAL_MODULE    := libgslcblas
-#LOCAL_SRC_FILES := libgslcblas.so.0 
-#include $(PREBUILT_SHARED_LIBRARY)
-
+LOCAL_PATH=$(my_directory)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgslcblas
-LOCAL_SRC_FILES := libsgslcblas.a 
+LOCAL_SRC_FILES := ../../../../../externalpackages/gsl/install/lib/libgslcblas.a
 include $(PREBUILT_STATIC_LIBRARY)

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

@@ -3 +3 @@
 LOCAL_MODULE    := libISSMCore
 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog 
-LOCAL_SRC_FILES := libISSMCore.a
+LOCAL_SRC_FILES := ../../../../../lib/libISSMCore.a
 LOCAL_EXPORT_C_INCLUDES := $(ISSM_DIR)
 include $(PREBUILT_STATIC_LIBRARY)