diff --git a/ext/no_interaction_auth/BUILD.gn b/ext/no_interaction_auth/BUILD.gn index 9aad3eaed02f525709a3497015afcce25cbb75dc..93716a9427ecb9c8921b2f47f8f3fcf9ac2224a5 100644 --- a/ext/no_interaction_auth/BUILD.gn +++ b/ext/no_interaction_auth/BUILD.gn @@ -55,8 +55,6 @@ if (defined(ohos_lite)) { "//base/notification/common_event_service/frameworks/core/include", "//base/notification/common_event_service/interfaces/innerkits/native/include", "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/kits", - "//base/startup/syspara_lite/adapter/native/syspara/include", ] sources = [ @@ -82,11 +80,11 @@ if (defined(ohos_lite)) { "common_event_service:cesfwk_innerkits", "dsoftbus_standard:softbus_client", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "startup_l2:syspara", - "startup_l2:syspara_watchagent", ] defines = [ diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 8816e0bd32e510b9e3f09303fa6058ccafbc3256..20879378e928d052ba15f0c66ffc32361efed3da 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -55,8 +55,7 @@ if (defined(ohos_lite)) { "//base/notification/ces_lite/frameworks/core/include", "//base/notification/ces_lite/interfaces/innerkits/native/include", "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/kits", - "//base/startup/syspara_lite/adapter/native/syspara/include", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", ] sources = [ @@ -123,8 +122,7 @@ if (defined(ohos_lite)) { "//base/notification/common_event_service/frameworks/core/include", "//base/notification/common_event_service/interfaces/innerkits/native/include", "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/kits", - "//base/startup/syspara_lite/adapter/native/syspara/include", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", ] sources = [ @@ -154,11 +152,11 @@ if (defined(ohos_lite)) { "common_event_service:cesfwk_innerkits", "dsoftbus_standard:softbus_client", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "startup_l2:syspara", - "startup_l2:syspara_watchagent", ] defines = [ diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn old mode 100755 new mode 100644 index e1ca6fc255f080928d1ee71742c0cd3d9a31dd69..4f229a835a3eac2a5e5b248fbb3607b54a0903da --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -56,7 +56,7 @@ if (defined(ohos_lite)) { include_dirs += [ "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", "//utils/native/lite/include", "//utils/system/safwk/native/include", "//third_party/json/include", @@ -118,7 +118,7 @@ if (defined(ohos_lite)) { "${utils_path}:devicemanagerutils_mini", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", "//base/security/deviceauth/services:deviceauth", - "//base/startup/syspara_lite/frameworks/parameter/src:sysparam", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/distributedschedule/samgr_lite/samgr", "//third_party/bounds_checking_function:libsec_static", @@ -158,7 +158,7 @@ if (defined(ohos_lite)) { ] include_dirs += [ "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", "//utils/native/lite/include", "//utils/system/safwk/native/include", "//third_party/json/include", @@ -214,7 +214,7 @@ if (defined(ohos_lite)) { "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/security/deviceauth/services:deviceauth_sdk", - "//base/startup/syspara_lite/frameworks/parameter/src:sysparam", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/communication/ipc_lite:liteipc_adapter", "//foundation/distributedschedule/samgr_lite/samgr:samgr", @@ -328,11 +328,11 @@ if (defined(ohos_lite)) { "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "startup_l2:syspara", - "startup_l2:syspara_watchagent", "utils_base:utils", ] diff --git a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn index 6e5b0485c4c493b7ebf95e94ff34a3c475e26b3e..59c1e5fb8135045f109cc271f125aad85ea4ca9e 100644 --- a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn @@ -108,12 +108,12 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] } diff --git a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn index 2ae2955a9c36c2c15b8b7fe3c7ee927ae09182bd..549d6270f34f254b793d13fa23d8b2196ca2be48 100644 --- a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn @@ -83,9 +83,9 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") { ] external_deps = [ + "init:libbegetutil", "ipc:ipc_core", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] } diff --git a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn index f2a434fffb477163fcb8844b62c33f149fe2c136..d15153b4b3212eb23b784be9411423946a721a03 100644 --- a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn @@ -83,9 +83,9 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { ] external_deps = [ + "init:libbegetutil", "ipc:ipc_core", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] } diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn index a04cc37e952b7fe2829e40b3fdad685ee1bd0d3d..0c338448e2a451b876eccb87cb55b5b29a0d86f1 100644 --- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -112,12 +112,12 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] public_deps = [ diff --git a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn index a14746989de2f711e97042535c46b235bd0bc5f9..8bf260270c19dd586a68fd4d27f5bd903aec11ca 100644 --- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -113,12 +113,12 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] public_deps = [ diff --git a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 741f460d48f94dd6fc670ec077f5c6b2550d076b..0a044342c82bdeccc89b9a0d4629652fe44ce6c0 100644 --- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -112,12 +112,12 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] public_deps = [ diff --git a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn index 49d9fc61d1d7d716aa18109ea97b710fc5c3b349..214fea23e923b1d84612665f1375ed4b7ef1bbfb 100644 --- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -112,12 +112,12 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] public_deps = [ diff --git a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn index 445556d0c3356bfb9626b00d9eb95b18cf35c9b3..753c4f9e1f8321ce899acce1c21b9edfb20f8431 100644 --- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -112,12 +112,12 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "samgr_standard:samgr_proxy", - "startup_l2:syspara", ] public_deps = [ diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 6a67f2ad89ba23147a1a59514c449ca99622a466..8dd555e2eeb2afbd0129594bd6f11f816fa828be 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -30,7 +30,7 @@ if (defined(ohos_lite)) { include_dirs += [ "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", "//utils/native/lite/include", "//utils/system/safwk/native/include", "//third_party/json/include", @@ -54,7 +54,7 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", - "//base/startup/syspara_lite/frameworks/parameter/src:sysparam", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//foundation/distributedschedule/samgr_lite/samgr", "//third_party/bounds_checking_function:libsec_static", "//third_party/mbedtls", @@ -75,7 +75,7 @@ if (defined(ohos_lite)) { ] include_dirs += [ "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", "//utils/native/lite/include", "//utils/system/safwk/native/include", "//third_party/json/include", @@ -104,7 +104,7 @@ if (defined(ohos_lite)) { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/syspara_lite/frameworks/parameter/src:sysparam", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/communication/ipc_lite:liteipc_adapter", "//foundation/distributedschedule/samgr_lite/samgr:samgr",