commit 5449a46982bd69ef3cfc1a22ebb9c7098b19112b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 16 19:13:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 16 19:13:58 2019 +0000
tree 6d611111b139b0d738f6f9ac79dfa17e18f48c82
parent 06ea58579b197c9ffad91762bbd785929093ccb1
parent 52fc52755d4ffc58a8034926799eb9bed45d4b16

Merge "Update auto-generated files."

modules/camera/3_4/Android.mk

diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk
index ae408fa..3395b5b 100644
--- a/modules/camera/3_4/Android.mk
+++ b/modules/camera/3_4/Android.mk
@@ -97,10 +97,6 @@
 
 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 @@
   $(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