tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Disable XOM in camera.v4l2."

Browse source
This commit is contained in:
Treehugger Robot 2018-12-12 21:30:30 +00:00 committed by Gerrit Code Review
commit 1908ba0732
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/camera/3_4/Android.mk
View file

@ -97,6 +97,10 @@ LOCAL_STATIC_LIBRARIES := \
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 @@ LOCAL_SRC_FILES := \
$(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