!1947 优化L0 rom

Merge pull request !1947 from cheng_jinsong/L0_no_log

interfaces/innerkits/BUILD.gn

@@ -99,17 +99,18 @@ if (defined(ohos_lite)) {
         "__LITEOS_M__",
       ]
 
-      if (config_ohos_startup_init_lite_no_log) {
-        defines += [ "INIT_NO_LOG" ]
-      }
-
       include_dirs = include_common
       deps = [
-        "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static",
         "//base/startup/init/services/modules/init_hook:inithook",
         "//base/startup/init/services/modules/udid:libudidcomm",
         "//third_party/bounds_checking_function:libsec_static",
       ]
+      if (config_ohos_startup_init_lite_no_log) {
+        defines += [ "INIT_NO_LOG" ]
+      } else {
+        deps +=
+            [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static" ]
+      }
 
       sources = []
       if (enable_ohos_startup_init_feature_begetctl_liteos) {
@@ -132,10 +133,12 @@ if (defined(ohos_lite)) {
 
       if (enable_ohos_startup_init_feature_begetctl_liteos) {
         deps += [
-          "//base/startup/init/services/log:init_log",
           "//base/startup/init/services/param/liteos:param_client_lite",
           "//base/startup/init/services/utils:libinit_utils",
         ]
+        if (!config_ohos_startup_init_lite_no_log) {
+          deps += [ "//base/startup/init/services/log:init_log" ]
+        }
       }
     }
   }

services/log/init_log.c

@@ -143,18 +143,4 @@ INIT_LOCAL_API void EnableInitLog(InitLogLevel level)
 {
     g_logLevel = level;
     SetInitCommLog(InitLog);
-}
-
-INIT_LOCAL_API void EnableInitLogFromCmdline(void)
-{
-    SetInitCommLog(InitLog);
-    char level[MAX_BUFFER_LEN] = {0};
-    int ret = GetParameterFromCmdLine("initloglevel", level, MAX_BUFFER_LEN);
-    if (ret == 0) {
-        errno = 0;
-        unsigned int logLevel = (unsigned int)strtoul(level, 0, 10); // 10 is decimal
-        INIT_INFO_CHECK(errno == 0, return, "Failed strtoul %s, err=%d", level, errno);
-        SetInitLogLevel((InitLogLevel)logLevel);
-    }
-    return;
-}
+}
\ No newline at end of file

services/log/init_log.h

@@ -41,16 +41,16 @@ typedef void (*InitCommLog)(int logLevel, uint32_t domain, const char *tag, cons
 INIT_LOCAL_API void OpenLogDevice(void);
 INIT_LOCAL_API void InitLog(int logLevel, unsigned int domain, const char *tag, const char *fmt, va_list vargs);
 INIT_LOCAL_API void SetInitCommLog(InitCommLog logFunc);
-INIT_LOCAL_API void EnableInitLog(InitLogLevel level);
-INIT_LOCAL_API void EnableInitLogFromCmdline(void);
 
 #if defined(INIT_NO_LOG) || defined(PARAM_BASE)
+#define EnableInitLog(level) ((void)level)
 #define INIT_LOGV(fmt, ...)
 #define INIT_LOGI(fmt, ...)
 #define INIT_LOGW(fmt, ...)
 #define INIT_LOGE(fmt, ...)
 #define INIT_LOGF(fmt, ...)
 #else
+INIT_LOCAL_API void EnableInitLog(InitLogLevel level);
 #define INIT_LOGV(fmt, ...) \
     StartupLog(INIT_DEBUG, INIT_LOG_DOMAIN, INIT_LOG_TAG, "[%s:%d]" fmt, (FILE_NAME), (__LINE__), ##__VA_ARGS__)
 #define INIT_LOGI(fmt, ...) \

services/param/liteos/BUILD.gn

@@ -65,7 +65,6 @@ config("exported_header_files") {
 }
 
 base_sources = [
-  "//base/startup/init/services/log/init_commlog.c",
   "//base/startup/init/services/param/base/param_base.c",
   "//base/startup/init/services/param/base/param_comm.c",
   "//base/startup/init/services/param/base/param_trie.c",
@@ -117,6 +116,8 @@ static_library("param_client_lite") {
 
   if (config_ohos_startup_init_lite_no_log) {
     defines += [ "INIT_NO_LOG" ]
+  } else {
+    sources += [ "//base/startup/init/services/log/init_commlog.c" ]
   }
 
   if (ohos_kernel_type == "liteos_a") {

test/unittest/init/init_unittest.cpp

@@ -132,7 +132,6 @@ HWTEST_F(InitUnitTest, TestFdHoldService, TestSize.Level1)
 
 HWTEST_F(InitUnitTest, TestInitLog, TestSize.Level1)
 {
-    EnableInitLogFromCmdline();
     // test log
     CheckAndCreateDir(INIT_LOG_PATH);
     SetInitLogLevel(INIT_DEBUG);

test/unittest/param/param_stub.cpp

@@ -559,7 +559,6 @@ static void TestBeforeInit(void)
     CloseParamWorkSpace();
     paramSpace = GetParamWorkSpace();
     EXPECT_NE(paramSpace, nullptr);
-    EnableInitLogFromCmdline();
 
     // test read cmdline
     Fstab *stab = LoadRequiredFstab();