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

Commit 68f9d0dc authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions"" 

am: 712690b3

Change-Id: Ia9c56bdf0fa132ef07508a660c44c4560d20f967
parents b5f5ca9c 712690b3

services/mediacodec/minijail/Android.mk

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



# allow device specific additions to the syscall whitelist

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

                     $(dir)/mediacodec-seccomp.policy)

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

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

endif



include $(BUILD_SYSTEM)/base_rules.mk

services/mediaextractor/minijail/Android.mk

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



# allow device specific additions to the syscall whitelist

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

                     $(dir)/mediaextractor-seccomp.policy)

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

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

endif



include $(BUILD_SYSTEM)/base_rules.mk