Snap for 5582435 from c64375f263e6ed1dc7f0bc06477b54d17fb768af to qt-qpr1-release

[android-x86/packages-apps-Gallery2.git] / jni_jpegstream / Android.mk

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 2a09fb5..f1ea324 100644 (file)
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -6,21 +6,20 @@ 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_PRODUCT_MODULE := true
 
 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     := \