| commit | 51b0cc1bdd6031b52a248777280a2c1d03bf604b | [log] [tgz] |
|---|---|---|
| author | Ivan Lozano <ivanlozano@google.com> | Wed Jan 16 09:58:21 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 16 09:58:21 2019 -0800 |
| tree | 367357df366799e2794ab4bacbf5ba328d50c994 | |
| parent | 363054197fbad8e68fbbdd86b098e8b1386f8175 [diff] | |
| parent | 572153df8369dea628c980faf97c09db9545abc4 [diff] |
Merge "Revert "Disable XOM in libjni_jpegutil."" am: fbbd978b24 am: 572153df83 Change-Id: Ib45bd50cf941ec9559cda7cb59ac4f61866ad561
diff --git a/jni/Android.mk b/jni/Android.mk index df99900..bdb4167 100644 --- a/jni/Android.mk +++ b/jni/Android.mk
@@ -32,7 +32,4 @@ LOCAL_CFLAGS += -Wall -Wextra -Werror LOCAL_ARM_MODE := arm -# Remove when libjpeg_static_ndk is XOM compatible. -LOCAL_XOM := false - include $(BUILD_SHARED_LIBRARY)