commit a6a462a0157779c09fb4142ba3738162fb364bf7
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 13 00:08:05 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 13 00:08:05 2018 +0000
tree 6e21bd9b68f60fc594aebdaa78bbb9948173779e
parent 1908ba07322c7e163ae668bfbacd48a43eb3baaa
parent 6c8e827c618704a29004767bcdbddf77059741f7

Merge "Fix performance-for-range-copy warnings"

modules/camera/3_4/Android.mk

diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk
index 3395b5b..ae408fa 100644
--- a/modules/camera/3_4/Android.mk
+++ b/modules/camera/3_4/Android.mk
@@ -97,6 +97,10 @@
 
 LOCAL_C_INCLUDES += $(v4l2_c_includes)
 LOCAL_SRC_FILES := $(v4l2_src_files)
+
+# Remove when libjpeg_static_ndk is XOM compatible
+LOCAL_XOM := false
+
 include $(BUILD_SHARED_LIBRARY)
 
 # Unit tests for V4L2 Camera HAL.
@@ -115,6 +119,9 @@
   $(v4l2_src_files) \
   $(v4l2_test_files) \
 
+# Remove when libjpeg_static_ndk is XOM compatible
+LOCAL_XOM := false
+
 include $(BUILD_NATIVE_TEST)
 
 endif # USE_CAMERA_V4L2_HAL