diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2019-01-15 22:17:12 +0000 |
|---|---|---|
| committer | Ivan Lozano <ivanlozano@google.com> | 2019-01-15 22:17:12 +0000 |
| commit | 30919be93462fc0b6c4bb05376422ef888ed742b (patch) | |
| tree | a62815ec7c391abbf8fa01be297dca2105619d9d | |
| parent | 11b6adfe6029a531cdb577cf12e5bdae159434eb (diff) | |
| download | android_packages_apps_Camera2-30919be93462fc0b6c4bb05376422ef888ed742b.tar.gz android_packages_apps_Camera2-30919be93462fc0b6c4bb05376422ef888ed742b.tar.bz2 android_packages_apps_Camera2-30919be93462fc0b6c4bb05376422ef888ed742b.zip | |
Revert "Disable XOM in libjni_jpegutil."
This reverts commit 11b6adfe6029a531cdb577cf12e5bdae159434eb.
Reason for revert: libjpeg-turbo has been updated with XOM compatibility.
Change-Id: Ib23dd855eab1ad775770c4d0a0f12efd70abfd16
| -rw-r--r-- | jni/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 6798594e4..8e8de570f 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -30,7 +30,4 @@ LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops LOCAL_CFLAGS += -Wall -Wextra -Werror LOCAL_ARM_MODE := arm -# Remove when libjpeg_static_ndk is XOM compatible. -LOCAL_XOM := false - include $(BUILD_SHARED_LIBRARY) |