Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e119cfe3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"

parents f521451f 87a80ef1

services/mediacodec/minijail/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ else 
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 += $(foreach dir, $(BOARD_SECCOMP_POLICY), \

                     $(dir)/mediacodec-seccomp.policy)



include $(BUILD_SYSTEM)/base_rules.mk

services/mediaextractor/minijail/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ else 
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 += $(foreach dir, $(BOARD_SECCOMP_POLICY), \

                     $(dir)/mediaextractor-seccomp.policy)



include $(BUILD_SYSTEM)/base_rules.mk