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

Commit 5a5842ab authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions" 

Seeing the following build errors:

  $ . ./build/envsetup.sh  && lunch aosp_dragon-userdebug
  $ m -j 50
  ...
  Starting build with ninja
  ninja: Entering directory `.'
  ninja: error: 'device/google/dragon/seccomp/mediaextractor-seccomp.policy', needed by 'out/target/product/dragon/obj/ETC/mediaextractor-seccomp.policy_intermediates/mediaextractor-seccomp.policy', missing and no known rule to make it
  make: *** [ninja_wrapper] Error 1
  make: Leaving directory `/SDD/master'


This reverts commit 87a80ef1.

Change-Id: I5d039845c69b18f3a7199458c5301314d006f43b
parent 87a80ef1

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