commit 39c76c8c7f88b047e0d9624228050dfd535ab899
author Dan Willemsen <dwillemsen@google.com> Fri Jun 17 15:51:01 2016 -0700
committer LuK1337 <priv.luk@gmail.com> Thu Nov 26 11:21:26 2020 +0100
tree 91dc6dc19e4c9bca270e60122032bfd9cc4c915c
parent bb50487d91ce359d8073708c49c6adcba1322ec7

Use a NDK-compatible libjpeg

Change-Id: I5c6e3efca5574a97ff130e43609f860137c67572

jni_jpegstream/Android.mk

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 8355a8e..2f3e5a1 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -9,16 +9,14 @@
 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_SDK_VERSION   := 9
 LOCAL_ARM_MODE := arm
 LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-LOCAL_CPPFLAGS += $(JNI_CFLAGS)
 LOCAL_LDLIBS := -llog
 
 LOCAL_CPP_EXTENSION := .cpp