X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=jni_jpegstream%2FAndroid.mk;h=7b4d9a4717e54e9e8e1aeed82d344090949ba279;hb=817b66c17b2bcc24f8e75e180d9df1623f755430;hp=2a09fb5d96626cc21c0cf271029ed35533e2a790;hpb=21ba70c26659413256882d3e97015bf12477607d;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 2a09fb5d9..7b4d9a471 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -6,21 +6,19 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE        := libjni_jpegstream
 
-LOCAL_NDK_STL_VARIANT := stlport_static
+LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
-                    $(LOCAL_PATH)/src \
-                    external/jpeg
+                    $(LOCAL_PATH)/src
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
 
-LOCAL_LDFLAGS        := -llog
-LOCAL_SDK_VERSION   := 9
+LOCAL_SDK_VERSION   := 17
 LOCAL_ARM_MODE := arm
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-LOCAL_CPPFLAGS += $(JNI_CFLAGS)
-
+LOCAL_CFLAGS += -Wall -Wextra -Werror
+LOCAL_LDLIBS := -llog
 
 LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES     := \