commit 3fac49442d7879a25638e2ee5b13c33ebcadabed
author Ivan Lozano <ivanlozano@google.com> Thu Dec 13 10:40:14 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 13 10:40:14 2018 -0800
tree 20c50b091e831f6090d14d2b3e1968b5507f46ef
parent 8593adfe77790fbfef2a3f50484af617fdf2ebe4
parent c334599dfe75b8dbcfa212599eead0dbf0a283de

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

Change-Id: I730f62bfb2f28cf919614af3a5f7e0b8445079b0

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