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

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

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

Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" am: e119cfe3 am: b5f5ca9c am: 7f9eed98
am: dd4e264b

Change-Id: Ib9e79b5ca043c4dfeeda101caf0e8fcbc1844991
parents 6b8937f4 dd4e264b

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
@@ -9,9 +9,8 @@ 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

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