diff --git a/init/Android.bp b/init/Android.bp index 81e7dd970..db8cdcb25 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -62,7 +62,6 @@ cc_defaults { }, }, static_libs: [ - "libseccomp_policy", "libavb", "libc++fs", "libcgrouprc_format", diff --git a/init/Android.mk b/init/Android.mk index d7258a794..4e73898fe 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -92,7 +92,6 @@ LOCAL_STATIC_LIBRARIES := \ liblogwrap \ libext4_utils \ libfscrypt \ - libseccomp_policy \ libcrypto_utils \ libsparse \ libavb \ diff --git a/init/init.cpp b/init/init.cpp index e5d103640..4e5f2c18d 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -579,15 +578,6 @@ void HandleKeychord(const std::vector& keycodes) { } } -static void GlobalSeccomp() { - import_kernel_cmdline(false, [](const std::string& key, const std::string& value, - bool in_qemu) { - if (key == "androidboot.seccomp" && value == "global" && !set_global_seccomp_filter()) { - LOG(FATAL) << "Failed to globally enable seccomp!"; - } - }); -} - static void UmountDebugRamdisk() { if (umount("/debug_ramdisk") != 0) { LOG(ERROR) << "Failed to umount /debug_ramdisk"; @@ -673,9 +663,6 @@ int SecondStageMain(int argc, char** argv) { LOG(ERROR) << "Unable to write -1000 to /proc/1/oom_score_adj: " << result.error(); } - // Enable seccomp if global boot option was passed (otherwise it is enabled in zygote). - GlobalSeccomp(); - // Set up a session keyring that all processes will have access to. It // will hold things like FBE encryption keys. No process should override // its session keyring.