OSDN Git Service
(root)
/
android-x86
/
packages-apps-Gallery2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Revert "Disable XOM in libjni_jpegstream.""
[android-x86/packages-apps-Gallery2.git]
/
jni_jpegstream
/
Android.mk
diff --git
a/jni_jpegstream/Android.mk
b/jni_jpegstream/Android.mk
index
4bf33e0
..
f1ea324
100644
(file)
--- a/
jni_jpegstream/Android.mk
+++ b/
jni_jpegstream/Android.mk
@@
-32,7
+32,5
@@
LOCAL_SRC_FILES := \
src/outputstream_wrapper.cpp \
src/stream_wrapper.cpp
-# Remove when libjpeg_static_ndk is XOM compatible.
-LOCAL_XOM := false
include $(BUILD_SHARED_LIBRARY)