commit bff72ff3ae5edc740c48a59b147767c31a7ec438
author Alex Naidis <alex.naidis@linux.com> Fri Nov 11 17:53:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 11 17:53:40 2016 +0000
tree d079e15a7d6f5409b90b66da3eb0c398adff2042
parent be2ab2bfdad07861c213fa960faa53658cfe04dc
parent c9c32a8dcc65d861c9016b1584c2dbd29a1fab7d

Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" am: da4cb8cb6c am: 07d040d389
am: c9c32a8dcc

Change-Id: Ida14853e8bd5aa68e9ac7b21d5aa81338dfb0897

services/mediacodec/minijail/Android.mk

diff --git a/services/mediacodec/minijail/Android.mk b/services/mediacodec/minijail/Android.mk
index d2becb4..de05bc3 100644
--- a/services/mediacodec/minijail/Android.mk
+++ b/services/mediacodec/minijail/Android.mk
@@ -15,9 +15,8 @@
 endif
 
 # allow device specific additions to the syscall whitelist
-ifneq (,$(wildcard $(BOARD_SECCOMP_POLICY)/mediacodec-seccomp.policy))
-    LOCAL_SRC_FILES += $(BOARD_SECCOMP_POLICY)/mediacodec-seccomp.policy
-endif
+LOCAL_SRC_FILES += $(wildcard $(foreach dir, $(BOARD_SECCOMP_POLICY), \
+                     $(dir)/mediacodec-seccomp.policy))
 
 include $(BUILD_SYSTEM)/base_rules.mk
 

services/mediaextractor/minijail/Android.mk

diff --git a/services/mediaextractor/minijail/Android.mk b/services/mediaextractor/minijail/Android.mk
index 79c5505..0cf8eff 100644
--- a/services/mediaextractor/minijail/Android.mk
+++ b/services/mediaextractor/minijail/Android.mk
@@ -15,9 +15,8 @@
 endif
 
 # allow device specific additions to the syscall whitelist
-ifneq (,$(wildcard $(BOARD_SECCOMP_POLICY)/mediaextractor-seccomp.policy))
-    LOCAL_SRC_FILES += $(BOARD_SECCOMP_POLICY)/mediaextractor-seccomp.policy
-endif
+LOCAL_SRC_FILES += $(wildcard $(foreach dir, $(BOARD_SECCOMP_POLICY), \
+                     $(dir)/mediaextractor-seccomp.policy))
 
 include $(BUILD_SYSTEM)/base_rules.mk