Allow media.codec and media.extractor to specify two policy files.
Bug: Bug: 34723744
Test: Unit tests.
Test: media.codec, media.extractor start, have Seccomp.
Test: cat /proc/`pgrep .codec`/status | grep Seccomp
Seccomp: 2
Test: cat /proc/`pgrep .extractor`/status | grep Seccomp
Seccomp: 2
Change-Id: If5c3dcc934f5d76bd32859b2f7b7ecb772a56303
diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index f594096..6cbb368 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -23,6 +23,8 @@
#include <binder/IServiceManager.h>
#include <cutils/properties.h>
+#include <string>
+
#include <android-base/logging.h>
// from LOCAL_C_INCLUDES
@@ -40,7 +42,7 @@
{
LOG(INFO) << "mediacodecservice starting";
signal(SIGPIPE, SIG_IGN);
- SetUpMinijail(kSeccompPolicyPath);
+ SetUpMinijail(kSeccompPolicyPath, std::string());
strcpy(argv[0], "media.codec");
sp<ProcessState> proc(ProcessState::self());