| commit | 24fc7e20e4b2620098bd3e284ced9b1812856580 | [log] [tgz] |
|---|---|---|
| author | Ivan Lozano <ivanlozano@google.com> | Fri Nov 30 00:36:04 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 30 00:36:04 2018 -0800 |
| tree | 10723ea748b1208a4b8ddc9237a4f33173048659 | |
| parent | 471e2c285e5d58c5b2a5b1044b6aa90abbab6351 [diff] | |
| parent | 959da569e0962a95bafb0a3556234ff3ecd9f714 [diff] |
Merge "Disable XOM in libjni_jpegutil." am: 8976366652 am: 959da569e0 Change-Id: Ia126e654f64ab8f73639e3a8abf6066b1d39c4df
diff --git a/jni/Android.mk b/jni/Android.mk index 8e8de57..6798594 100644 --- a/jni/Android.mk +++ b/jni/Android.mk
@@ -30,4 +30,7 @@ LOCAL_CFLAGS += -Wall -Wextra -Werror LOCAL_ARM_MODE := arm +# Remove when libjpeg_static_ndk is XOM compatible. +LOCAL_XOM := false + include $(BUILD_SHARED_LIBRARY)