| commit | 959da569e0962a95bafb0a3556234ff3ecd9f714 | [log] [tgz] |
|---|---|---|
| author | Ivan Lozano <ivanlozano@google.com> | Fri Nov 30 00:17:10 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 30 00:17:10 2018 -0800 |
| tree | 6165402c9f73c2188584873daeb9af4521faee29 | |
| parent | 293a6a0e5daf7057e43a82fc3d45d1e013bdbfaa [diff] | |
| parent | 897636665285bb04c0e637c3ad290e3a74b5f42d [diff] |
Merge "Disable XOM in libjni_jpegutil." am: 8976366652 Change-Id: Id12b00c639d83e039ad9b07d95285139e2457b88
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)