Disable XOM in camera.v4l2.
Disable execute-only memory layouts in camera.v4l2.
This relies on libjpeg_static_ndk, which contains some data mixed into
code and thus requires a readable .text.
Bug: 77958880
Test: Built the library, checked the program headers with readelf.
Change-Id: I5646b8c5e9a0ad151663df29f019b5a84db4b15c
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