diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-04-20 04:18:26 +0100 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-04-20 04:18:26 +0100 |
| commit | 9da246e99991f846c9ed165a41b67219dc892921 (patch) | |
| tree | 5057cd58a870cb4c09c77ab6ef48ef0f695602a8 | |
| parent | 67676f887181cc329f1f1c828290e686d6ea6d5a (diff) | |
| download | base-9da246e99991f846c9ed165a41b67219dc892921.tar.gz | |
Add flag to indicate if use the libjpeg-turbo projectlibjpeg-turbo
use this flag to decide which header file to include.
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | core/jni/Android.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index dbaa4b808716..f99f18ac54fb 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -194,7 +194,6 @@ LOCAL_C_INCLUDES += \ external/expat/lib \ external/openssl/include \ external/tremor/Tremor \ - external/jpeg \ external/harfbuzz_ng/src \ external/zlib \ frameworks/opt/emoji \ @@ -204,6 +203,13 @@ LOCAL_C_INCLUDES += \ external/freetype/include # TODO: clean up Minikin so it doesn't need the freetype include + +ifneq (true, $(USE_LIBJPEG_TURBO)) +LOCAL_C_INCLUDES += external/jpeg +else +LOCAL_C_INCLUDES += external/libjpeg-turbo +endif + LOCAL_SHARED_LIBRARIES := \ libmemtrack \ libandroidfw \ |