diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-12-12 21:30:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-12 21:30:30 +0000 |
| commit | 1908ba07322c7e163ae668bfbacd48a43eb3baaa (patch) | |
| tree | cb1c702c33f0f5cb5ba81d12133c2057b1e8236b | |
| parent | 0b2aabd6e6c871c085eed7cd889fc818fa150811 (diff) | |
| parent | 7c7c62db251ba3deade6ba8bb1536b7ef0001d24 (diff) | |
| download | libhardware-1908ba07322c7e163ae668bfbacd48a43eb3baaa.tar.gz | |
Merge "Disable XOM in camera.v4l2."
| -rw-r--r-- | modules/camera/3_4/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk index 3395b5bd..ae408fae 100644 --- a/modules/camera/3_4/Android.mk +++ b/modules/camera/3_4/Android.mk @@ -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 |