| commit | 897636665285bb04c0e637c3ad290e3a74b5f42d | [log] [tgz] |
|---|---|---|
| author | Ivan Lozano <ivanlozano@google.com> | Fri Nov 30 01:04:58 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 30 01:04:58 2018 +0000 |
| tree | 6165402c9f73c2188584873daeb9af4521faee29 | |
| parent | cb669b4458b05a02a53ab416686131c680076e9b [diff] | |
| parent | 11b6adfe6029a531cdb577cf12e5bdae159434eb [diff] |
Merge "Disable XOM in libjni_jpegutil."
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)