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

Commit 07d040d3 authored by Alex Naidis's avatar Alex Naidis Committed by android-build-merger
Browse files

Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" 

am: da4cb8cb

Change-Id: Ia85752fe429a0fbb985ca0ad5425029c0a2811cf
parents f34b5f6e da4cb8cb

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 += $(wildcard $(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 += $(wildcard $(foreach dir, $(BOARD_SECCOMP_POLICY), \

                     $(dir)/mediaextractor-seccomp.policy))



include $(BUILD_SYSTEM)/base_rules.mk