commit 6ca60bc34661f3e0c7d1d472d41b1f59eaf5816e
author Ivan Lozano <ivanlozano@google.com> Wed Dec 12 13:55:35 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 12 13:55:35 2018 -0800
tree cb1c702c33f0f5cb5ba81d12133c2057b1e8236b
parent 40283a933d6a09ecc8b33b84d93e248f12403ed3
parent 1908ba07322c7e163ae668bfbacd48a43eb3baaa

Merge "Disable XOM in camera.v4l2."
am: 1908ba0732

Change-Id: I59231a87d4e9c16c47e85155cf9722495fe296a3

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