sync rtklib

illarionov · Sep 29, 2013 · 2f281ee · 2f281ee
1 parent 9aac234
commit 2f281ee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.classpath b/.classpath
@@ -9,6 +9,6 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/jni/Application.mk b/jni/Application.mk
@@ -5,10 +5,8 @@ APP_ABI := armeabi-v7a x86
 APP_PLATFORM := android-8
 
 #NDK_TOOLCHAIN_VERSION=clang
-NDK_TOOLCHAIN_VERSION=4.7
 NDK_MODULE_PATH=$(APP_PROJECT_PATH)/jni
 
 #APP_OPTIM := debug
 #APP_CFLAGS += -O3 -flto -fgraphite -fgraphite-identity
 #APP_LDFLAGS += -flto -fgraphite -fgraphite-identity
-
diff --git a/jni/RTKLIB b/jni/RTKLIB
diff --git a/jni/rtklib.mk b/jni/rtklib.mk
@@ -14,7 +14,6 @@ LOCAL_EXPORT_CFLAGS := $(RTKLIB_CFLAGS)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RTKLIB_PATH)/src
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/$(RTKLIB_PATH)/src
 
-LOCAL_LDLIBS += -llog
 LOCAL_EXPORT_LDLIBS += -llog
 
 LOCAL_SRC_FILES := \
@@ -50,8 +49,8 @@ LOCAL_SRC_FILES := \
 
 LOCAL_SRC_FILES += \
         $(RTKLIB_PATH)/src/rcv/binex.c \
-	$(RTKLIB_PATH)/src/rcv/crescent.c \
-	$(RTKLIB_PATH)/src/rcv/gw10.c \
+        $(RTKLIB_PATH)/src/rcv/crescent.c \
+        $(RTKLIB_PATH)/src/rcv/gw10.c \
         $(RTKLIB_PATH)/src/rcv/javad.c \
         $(RTKLIB_PATH)/src/rcv/novatel.c \
         $(RTKLIB_PATH)/src/rcv/nvs.c \