diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-16 17:36:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-16 17:36:58 +0000 |
| commit | fbbd978b24a933bd879657d01eb0a20e77aba967 (patch) | |
| tree | ca418a3b1f9f022fbcf4f0105f8704a2ed397983 | |
| parent | fdeaaa43a0b26aa00a0ee9305d2aa4ae796bb988 (diff) | |
| parent | 30919be93462fc0b6c4bb05376422ef888ed742b (diff) | |
| download | android_packages_apps_Camera2-fbbd978b24a933bd879657d01eb0a20e77aba967.tar.gz android_packages_apps_Camera2-fbbd978b24a933bd879657d01eb0a20e77aba967.tar.bz2 android_packages_apps_Camera2-fbbd978b24a933bd879657d01eb0a20e77aba967.zip | |
Merge "Revert "Disable XOM in libjni_jpegutil.""
| -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 df999004a..bdb416789 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -32,7 +32,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) |