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

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

Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" am: e119cfe3 

am: b5f5ca9c

Change-Id: I147e8d80596724e81178bcfe5dc7fe9cf131f91f
parents 3b70dd2d b5f5ca9c

services/mediacodec/minijail/Android.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -15,9 +15,8 @@ else 
endif

endif





# allow device specific additions to the syscall whitelist

# allow device specific additions to the syscall whitelist

ifneq (,$(wildcard $(BOARD_SECCOMP_POLICY)/mediacodec-seccomp.policy))

LOCAL_SRC_FILES += $(foreach dir, $(BOARD_SECCOMP_POLICY), \

    LOCAL_SRC_FILES += $(BOARD_SECCOMP_POLICY)/mediacodec-seccomp.policy

                     $(dir)/mediacodec-seccomp.policy)

endif





include $(BUILD_SYSTEM)/base_rules.mk

include $(BUILD_SYSTEM)/base_rules.mk

services/mediaextractor/minijail/Android.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -15,9 +15,8 @@ else 
endif

endif





# allow device specific additions to the syscall whitelist

# allow device specific additions to the syscall whitelist

ifneq (,$(wildcard $(BOARD_SECCOMP_POLICY)/mediaextractor-seccomp.policy))

LOCAL_SRC_FILES += $(foreach dir, $(BOARD_SECCOMP_POLICY), \

    LOCAL_SRC_FILES += $(BOARD_SECCOMP_POLICY)/mediaextractor-seccomp.policy

                     $(dir)/mediaextractor-seccomp.policy)

endif





include $(BUILD_SYSTEM)/base_rules.mk

include $(BUILD_SYSTEM)/base_rules.mk