!3164 init feature变量名整改

Merge pull request !3164 from 林楠木/0920

begetd.gni

@@ -31,14 +31,14 @@ declare_args() {
   config_ohos_startup_init_lite_data_path = "/"
 
   # config memory size for liteos-m
-  config_ohos_startup_init_lite_memory_size = 5120
+  init_lite_memory_size = 5120
 
   startup_init_feature_decode_group_file = false
 
   startup_init_test_performance = true
 
   # log display control
-  config_ohos_startup_init_lite_no_log = false
+  init_lite_no_log = false
 
   startup_init_with_param_base = false
   if (!use_musl) {
@@ -50,8 +50,8 @@ declare_args() {
   init_appspawn_client_module = true
 
   # begetutil extension module
-  startup_begetutil_extra_modules = ""
-  startup_init_extra_static_modules = ""
+  init_begetutil_extra_modules = ""
+  init_extra_static_modules = ""
 
   init_use_encaps = false
 

interfaces/innerkits/BUILD.gn

@@ -107,7 +107,7 @@ if (defined(ohos_lite)) {
         "//base/startup/init/services/modules/udid:libudidcomm",
       ]
       external_deps = [ "bounds_checking_function:libsec_static" ]
-      if (config_ohos_startup_init_lite_no_log) {
+      if (init_lite_no_log) {
         defines += [ "INIT_NO_LOG" ]
       } else {
         deps +=
@@ -138,7 +138,7 @@ if (defined(ohos_lite)) {
           "//base/startup/init/services/param/liteos:param_client_lite",
           "//base/startup/init/services/utils:libinit_utils",
         ]
-        if (!config_ohos_startup_init_lite_no_log) {
+        if (!init_lite_no_log) {
           deps += [ "//base/startup/init/services/log:init_log" ]
         }
       }
@@ -209,8 +209,8 @@ if (defined(ohos_lite)) {
       "//base/startup/init/services/utils:libinit_utils",
     ]
     deps += [ "//base/startup/init/services/param/base:param_base" ]
-    if (startup_begetutil_extra_modules != "") {
-      deps += [ startup_begetutil_extra_modules ]
+    if (init_begetutil_extra_modules != "") {
+      deps += [ init_begetutil_extra_modules ]
     }
 
     external_deps = [

services/etc/BUILD.gn

@@ -104,7 +104,7 @@ if (defined(ohos_lite)) {
       "system",
       "updater",
     ]
-    if (startup_init_extra_static_modules != "") {
+    if (init_extra_static_modules != "") {
       install_enable = false
     }
     part_name = "init"
@@ -117,7 +117,7 @@ if (defined(ohos_lite)) {
       "system",
       "updater",
     ]
-    if (startup_init_extra_static_modules != "") {
+    if (init_extra_static_modules != "") {
       install_enable = false
     }
     part_name = "init"

services/init/standard/BUILD.gn

@@ -52,8 +52,8 @@ ohos_executable("init_early") {
     "//base/startup/init/services/log:init_log",
     "//base/startup/init/ueventd:libueventd_ramdisk_static",
   ]
-  if (startup_init_extra_static_modules != "") {
-    deps += [ startup_init_extra_static_modules ]
+  if (init_extra_static_modules != "") {
+    deps += [ init_extra_static_modules ]
   }
   install_images = [ "ramdisk" ]
   install_enable = true
@@ -193,8 +193,8 @@ ohos_executable("init") {
   if (asan_detector) {
     defines += [ "ASAN_DETECTOR" ]
   }
-  if (startup_init_extra_static_modules != "") {
-    deps += [ startup_init_extra_static_modules ]
+  if (init_extra_static_modules != "") {
+    deps += [ init_extra_static_modules ]
   }
 
   version_script = get_label_info(

services/modules/udid/BUILD.gn

@@ -30,7 +30,7 @@ if (defined(ohos_lite)) {
       "_GNU_SOURCE",
       "OHOS_LITE",
     ]
-    if (config_ohos_startup_init_lite_no_log) {
+    if (init_lite_no_log) {
       defines += [ "INIT_NO_LOG" ]
     }
     include_dirs = comm_include

services/param/base/BUILD.gn

@@ -82,9 +82,8 @@ if (defined(ohos_lite)) {
         "PARAMWORKSPACE_NEED_MUTEX",
       ]
     }
-    if (defined(config_ohos_startup_init_lite_memory_size)) {
-      defines +=
-          [ "PARAM_WORKSPACE_MAX=${config_ohos_startup_init_lite_memory_size}" ]
+    if (defined(init_lite_memory_size)) {
+      defines += [ "PARAM_WORKSPACE_MAX=${init_lite_memory_size}" ]
     }
   }
 } else {

services/param/liteos/BUILD.gn

@@ -103,9 +103,8 @@ static_library("param_init_lite") {
       "PARAM_SUPPORT_CYCLE_CHECK",
     ]
   }
-  if (defined(config_ohos_startup_init_lite_memory_size)) {
-    defines +=
-        [ "PARAM_WORKSPACE_MAX=${config_ohos_startup_init_lite_memory_size}" ]
+  if (defined(init_lite_memory_size)) {
+    defines += [ "PARAM_WORKSPACE_MAX=${init_lite_memory_size}" ]
   }
 }
 
@@ -116,7 +115,7 @@ static_library("param_client_lite") {
   public_configs = [ ":exported_header_files" ]
   external_deps = [ "bounds_checking_function:libsec_static" ]
 
-  if (config_ohos_startup_init_lite_no_log) {
+  if (init_lite_no_log) {
     defines += [ "INIT_NO_LOG" ]
   } else {
     sources += [ "//base/startup/init/services/log/init_commlog.c" ]
@@ -156,9 +155,8 @@ static_library("param_client_lite") {
       defines += [ "PARAM_LOAD_CFG_FROM_CODE" ]
     }
 
-    if (defined(config_ohos_startup_init_lite_memory_size)) {
-      defines +=
-          [ "PARAM_WORKSPACE_MAX=${config_ohos_startup_init_lite_memory_size}" ]
+    if (defined(init_lite_memory_size)) {
+      defines += [ "PARAM_WORKSPACE_MAX=${init_lite_memory_size}" ]
     }
   }
 }

services/utils/BUILD.gn

@@ -32,7 +32,7 @@ if (defined(ohos_lite)) {
       "OHOS_LITE",
     ]
     external_deps = [ "bounds_checking_function:libsec_static" ]
-    if (config_ohos_startup_init_lite_no_log) {
+    if (init_lite_no_log) {
       defines += [ "INIT_NO_LOG" ]
     }
   }