commit c9ea2114a26470e0f3b010392132b5394d358031
author Jeff Vander Stoep <jeffv@google.com> Wed Feb 17 10:52:20 2016 -0800
committer Jeffrey Vander Stoep <jeffv@google.com> Tue Mar 01 02:11:38 2016 +0000
tree 3f31b24936f4c5f5b31dafd0932891b394148e11
parent fc958a0888d47b5d34847afab3b33d877d9ca007

mediacodec: add seccomp filter for arm/arm64

mediacodec always runs in 32 bit mode so the arm seccomp filter is also
used on arm64 devices.

Tests: mediaserver CTS for bullhead, volantis and shamu

Add policy to log blocked syscalls to syslog and allow debuggerd attach
on mediacodec crash.

Bug: 27066802, 27064966
Change-Id: I4bdbba25b8847afa98d89b4b4ca863829fa19754

services/mediacodec/Android.mk

diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index 239b4e1..a5f0751 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -14,8 +14,10 @@
 
 # service executable
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := main_codecservice.cpp
-LOCAL_SHARED_LIBRARIES := libmedia libmediacodecservice libbinder libutils liblog
+LOCAL_REQUIRED_MODULES_arm := mediacodec-seccomp.policy
+LOCAL_SRC_FILES := main_codecservice.cpp minijail/minijail.cpp
+LOCAL_SHARED_LIBRARIES := libmedia libmediacodecservice libbinder libutils \
+	liblog libminijail
 LOCAL_C_INCLUDES := \
     $(TOP)/frameworks/av/media/libstagefright \
     $(TOP)/frameworks/native/include/media/openmax
@@ -24,4 +26,5 @@
 LOCAL_INIT_RC := mediacodec.rc
 include $(BUILD_EXECUTABLE)
 
+include $(call all-makefiles-under, $(LOCAL_PATH))