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

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

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

Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions"" am: 712690b3 am: 68f9d0dc am: e40f36df
am: 7b9bd40f

Change-Id: I5471b7363060b98c8a247459006b9cc08af4708a
parents add8b129 7b9bd40f

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
@@ -9,8 +9,9 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/seccomp_policy 
LOCAL_SRC_FILES := $(LOCAL_PATH)/seccomp_policy/mediaextractor-seccomp-$(TARGET_ARCH).policy



# 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