Merge \"Use a NDK-compatible libjpeg\"

am: 0f763c5d10

Change-Id: Ie43896a8e9ff28542a363caf0d5c74092b5f9145

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 97d57ee..027bf92 100644 (file)
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -9,16 +9,14 @@ LOCAL_MODULE        := libjni_jpegstream
 LOCAL_NDK_STL_VARIANT := stlport_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_SDK_VERSION   := 9
 LOCAL_ARM_MODE := arm
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-LOCAL_CPPFLAGS += $(JNI_CFLAGS)
 LOCAL_LDLIBS := -llog
 
 LOCAL_CPP_EXTENSION := .cpp