Move Gallery2 and its libs to /product

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

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 027bf92..4bf33e0 100644 (file)
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -6,17 +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
 
 LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
 
-LOCAL_SDK_VERSION   := 9
+LOCAL_SDK_VERSION   := 17
 LOCAL_ARM_MODE := arm
+LOCAL_PRODUCT_MODULE := true
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -Wall -Wextra -Werror
 LOCAL_LDLIBS := -llog
 
 LOCAL_CPP_EXTENSION := .cpp
@@ -30,5 +32,7 @@ LOCAL_SRC_FILES     := \
     src/outputstream_wrapper.cpp \
     src/stream_wrapper.cpp
 
+# Remove when libjpeg_static_ndk is XOM compatible.
+LOCAL_XOM := false
 
 include $(BUILD_SHARED_LIBRARY)