Merge "Disable XOM in libjni_jpegstream." am: e768dafffd am: a2aac739f2

am: 087fedaf9d

Change-Id: I38dc60ec72c6e9ac1cf98f68e700d7c95c714b69

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 7b4d9a4..86ed797 100644 (file)
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -31,5 +31,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)