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

Merge "Revert "Disable XOM in camera.v4l2.""

Browse source 
am: 06ea58579b

Change-Id: I2a69c6882341e7c9fa0fe664bffaef14346da6a6
This commit is contained in:
Ivan Lozano 2019-01-15 17:03:12 -08:00 committed by android-build-merger
commit 36de427e99
1 changed files with 0 additions and 7 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,10 +97,6 @@ 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.
@ -119,9 +115,6 @@ 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