Merge android12-5.10 into android12-gs-pixel-5.10-sc-v2

Change-Id: I34668e383cc7aff9acd29e0d8bcd2eeab57d38ac Signed-off-by: Alex Hong <[email protected]>
celtare21 · Sep 27, 2021 · b9b33ce · b9b33ce
2 parents 3040c37 + de7ca5e
commit b9b33ce
Show file tree

Hide file tree

Showing 13 changed files with 5,477 additions and 5,445 deletions.
diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk
@@ -2237,6 +2237,7 @@
   v4l2_ctrl_request_complete
   v4l2_ctrl_request_setup
   __v4l2_ctrl_s_ctrl
+  __v4l2_ctrl_s_ctrl_compound
   v4l2_ctrl_subdev_subscribe_event
   v4l2_ctrl_subscribe_event
   v4l2_device_register