From 19a00d0ffba50d07f6495a904d66331b78db7031 Mon Sep 17 00:00:00 2001 From: xiacong Date: Tue, 26 Jul 2022 11:21:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E7=89=B9?= =?UTF-8?q?=E6=80=A7=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=BF=9B=E7=A8=8B=E6=B2=99?= =?UTF-8?q?=E7=9B=92=E7=8E=AF=E5=A2=83=E6=94=AF=E6=8C=81Seccomp-BPF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对BUILD.gn中init_lite修改为init Signed-off-by: xiacong Change-Id: Ife2f6e51da2adcb501f07fb3fed4151379390e4f --- BUILD.gn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 0ff7f5c1..ec6cac14 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -31,6 +31,7 @@ config("appspawn_config") { "//base/startup/init/services/loopevent/include", "//base/startup/init/interfaces/innerkits/include", "//third_party/json/include", + "//base/startup/init/services/modules/seccomp/include", ] if (build_selinux) { @@ -99,6 +100,13 @@ ohos_static_library("appspawn_server") { external_deps += [ "selinux:libhap_restorecon" ] } + + cflags = [] + if (build_seccomp) { + cflags += [ "-DWITH_SECCOMP" ] + deps += [ "//base/startup/init/services/modules/seccomp:seccomp" ] + } + if (appspawn_report_event) { cflags = [ "-DREPORT_EVENT" ] deps += [ "adapter/sysevent:event_reporter" ] @@ -145,6 +153,12 @@ ohos_static_library("nwebspawn_server") { external_deps += [ "selinux:libhap_restorecon" ] } + cflags = [] + if (build_seccomp) { + cflags += [ "-DWITH_SECCOMP" ] + deps += [ "//base/startup/init/services/modules/seccomp:seccomp" ] + } + subsystem_name = "${subsystem_name}" part_name = "${part_name}" } -- Gitee From 1cf1b39b14ca472529b67cd1dcb2a0d6ea3810e5 Mon Sep 17 00:00:00 2001 From: Hongjin Li Date: Sat, 30 Jul 2022 10:41:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20seccomp=20=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hongjin Li Change-Id: I02304e3b6ce858f3de07487d03a94d980030afc9 --- BUILD.gn | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index ec6cac14..a6d952d8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -31,7 +31,6 @@ config("appspawn_config") { "//base/startup/init/services/loopevent/include", "//base/startup/init/interfaces/innerkits/include", "//third_party/json/include", - "//base/startup/init/services/modules/seccomp/include", ] if (build_selinux) { @@ -104,11 +103,11 @@ ohos_static_library("appspawn_server") { cflags = [] if (build_seccomp) { cflags += [ "-DWITH_SECCOMP" ] - deps += [ "//base/startup/init/services/modules/seccomp:seccomp" ] + external_deps += [ "init:seccomp" ] } if (appspawn_report_event) { - cflags = [ "-DREPORT_EVENT" ] + cflags += [ "-DREPORT_EVENT" ] deps += [ "adapter/sysevent:event_reporter" ] } @@ -156,7 +155,7 @@ ohos_static_library("nwebspawn_server") { cflags = [] if (build_seccomp) { cflags += [ "-DWITH_SECCOMP" ] - deps += [ "//base/startup/init/services/modules/seccomp:seccomp" ] + external_deps += [ "init:seccomp" ] } subsystem_name = "${subsystem_name}" -- Gitee