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

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

Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" 

am: e119cfe3

Change-Id: I3e72b83d44731fa77f7ce7d397e804a9a5c46982
parents f5a4013d e119cfe3

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