openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-11-23 16:20:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add feature for parambase

Browse Source 
Signed-off-by: cheng_jinsong <chengjinsong2@huawei.com>
This commit is contained in:
cheng_jinsong 2022-11-28 09:49:02 +08:00
parent 6c61f22f58
commit b3f7b290a2
8 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
begetd.gni
View File

@ -29,4 +29,9 @@ declare_args() {
config_ohos_startup_init_lite_data_path = "/"
# boot_kernel_extended_cmdline for extend cmdline
startup_init_with_param_base = false
if (!use_musl) {
startup_init_with_param_base = true
}
}

14
interfaces/innerkits/BUILD.gn
View File

@ -85,7 +85,7 @@ if (defined(ohos_lite)) {
defines += [ "__LINUX__" ]
deps += [
"//base/startup/init/services/loopevent:loopevent",
"//base/startup/init/services/param/base:parameterbase",
"//base/startup/init/services/param/base:param_base",
"//base/startup/init/services/param/linux:param_client",
]
}
@ -194,11 +194,7 @@ if (defined(ohos_lite)) {
"//third_party/bounds_checking_function:libsec_shared",
"//third_party/mbedtls:mbedtls_shared",
]
if (use_musl == false) {
deps += [ "//base/startup/init/services/param/base:parameterbase" ]
} else {
deps += [ "//base/startup/init/services/param/base:parameterbase_ext" ]
}
deps += [ "//base/startup/init/services/param/base:param_base" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog_base",
@ -291,11 +287,7 @@ if (defined(ohos_lite)) {
"//third_party/bounds_checking_function:libsec_shared",
"//third_party/mbedtls:mbedtls_shared",
]
if (use_musl == false) {
deps += [ "//base/startup/init/services/param/base:parameterbase" ]
} else {
deps += [ "//base/startup/init/services/param/base:parameterbase_ext" ]
}
deps += [ "//base/startup/init/services/param/base:param_base" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog_base",

6
services/begetctl/BUILD.gn
View File

@ -187,11 +187,7 @@ if (defined(ohos_lite)) {
"//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_static",
]
if (use_musl == false) {
deps += [ "//base/startup/init/services/param/base:parameterbase" ]
} else {
deps += [ "//base/startup/init/services/param/base:parameterbase_ext" ]
}
deps += [ "//base/startup/init/services/param/base:param_base" ]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog_base",

3
services/init/lite/BUILD.gn
View File

@ -49,6 +49,7 @@ executable("init") {
include_dirs = [
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/fd_holder",
"//base/startup/init/services/include/param",
"//base/startup/init/services/init/include",
"//third_party/cJSON",
"//third_party/bounds_checking_function/include",
@ -61,7 +62,7 @@ executable("init") {
"//base/startup/init/services/log:init_log",
"//base/startup/init/services/loopevent:loopevent",
"//base/startup/init/services/modules/init_hook:inithook",
"//base/startup/init/services/param/base:parameterbase",
"//base/startup/init/services/param/base:param_base",
"//base/startup/init/services/utils:libinit_utils",
"//build/lite/config/component/cJSON:cjson_static",
"//third_party/bounds_checking_function:libsec_static",

6
services/init/standard/BUILD.gn
View File

@ -69,11 +69,7 @@ ohos_executable("init") {
"//base/startup/init/services/sandbox:sandbox",
"//base/startup/init/services/utils:libinit_utils",
]
if (use_musl == false) {
deps += [ "//base/startup/init/services/param/base:parameterbase" ]
} else {
deps += [ "//base/startup/init/services/param/base:parameterbase_ext" ]
}
deps += [ "//base/startup/init/services/param/base:param_base" ]
deps += [
"//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static",

4
services/param/BUILD.gn
View File

@ -19,7 +19,7 @@ group("parameter") {
if (defined(ohos_lite)) {
if (ohos_kernel_type == "linux") {
deps += [
"base:parameterbase",
"base:param_base",
"linux:param_client",
"linux:param_init",
]
@ -31,7 +31,7 @@ group("parameter") {
}
} else {
deps += [
"base:parameterbase",
"base:param_base",
"linux:param_client",
"linux:param_init",
]

22
services/param/base/BUILD.gn
View File

@ -71,7 +71,7 @@ if (defined(ohos_lite)) {
}
}
} else {
if (use_musl) {
if (!startup_init_with_param_base) {
inherited_configs = [
"//build/config/compiler:afdo",
"//build/config/compiler:afdo_optimize_size",
@ -109,13 +109,13 @@ if (defined(ohos_lite)) {
deps = []
if (use_musl) {
defines += [ "__MUSL__" ]
}
if (!startup_init_with_param_base) {
ldflags = [ "-nostdlib" ]
configs -= inherited_configs
configs += [ "//build/config/compiler:compiler" ]
defines += [
"PARAM_BASE",
"__MUSL__",
]
defines += [ "PARAM_BASE" ]
} else {
include_dirs += [ "//third_party/bounds_checking_function/include" ]
sources += [ "//base/startup/init/services/log/init_commlog.c" ]
@ -170,3 +170,15 @@ if (defined(ohos_lite)) {
subsystem_name = "startup"
}
}
group("param_base") {
if (defined(ohos_lite)) {
deps = [ ":parameterbase" ]
} else {
if (startup_init_with_param_base) {
deps = [ ":parameterbase" ]
} else {
deps = [ ":parameterbase_ext" ]
}
}
}

9
ueventd/BUILD.gn
View File

@ -10,13 +10,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/startup/init/begetd.gni")
if (defined(ohos_lite)) {
if (ohos_kernel_type == "linux") {
service_ueventd_deps = [
"//base/startup/init/interfaces/innerkits/socket:libsocket",
"//base/startup/init/services/log:init_log",
"//base/startup/init/services/param/base:parameterbase",
"//base/startup/init/services/param/base:param_base",
"//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_static",
]
@ -113,11 +114,7 @@ if (defined(ohos_lite)) {
deps = service_ueventd_deps
deps += [ "//base/startup/init/services/param/linux:param_client" ]
cflags = []
if (use_musl == false) {
deps += [ "//base/startup/init/services/param/base:parameterbase" ]
} else {
deps += [ "//base/startup/init/services/param/base:parameterbase_ext" ]
}
deps += [ "//base/startup/init/services/param/base:param_base" ]
if (build_selinux) {
external_deps = [ "selinux:librestorecon" ]
cflags += [ "-DWITH_SELINUX" ]