From 0b1f0883cfc4a28ceb253563d3bfed6853432e7b Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Tue, 15 Jan 2019 22:16:32 +0000 Subject: [PATCH] Revert "Disable XOM in libjni_jpegstream." This reverts commit fab93599d36b671167a12a957b8a339abd99619e. Reason for revert: libjpeg-turbo has been updated with XOM compatibility. Change-Id: Ia40f4046ba367af494d10ce6084157264e69fdf2 --- jni_jpegstream/Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk index 86ed7977c..7b4d9a471 100644 --- a/jni_jpegstream/Android.mk +++ b/jni_jpegstream/Android.mk @@ -31,7 +31,5 @@ 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) -- 2.11.0