From 5014528666bc8145a755e50855f4bb6d08f1dfe8 Mon Sep 17 00:00:00 2001 From: lijiahao Date: Fri, 29 Jul 2022 21:27:11 +0800 Subject: [PATCH] change utils path Signed-off-by: lijiahao --- bundle.json | 114 +++++++++---------- frameworks/bundle.json | 76 ++++++------- frameworks/unittest/BUILD.gn | 2 +- hals/parameter/BUILD.gn | 2 +- interfaces/innerkits/native/syspara/BUILD.gn | 14 +-- 5 files changed, 102 insertions(+), 106 deletions(-) diff --git a/bundle.json b/bundle.json index c78ac1d..62b0dd3 100644 --- a/bundle.json +++ b/bundle.json @@ -1,58 +1,58 @@ -{ - "name": "@ohos/startup_syspara_lite", - "description": "ohos parameter manager", - "homePage": "https://gitee.com/openharmony", - "version": "3.1", - "license": "Apache License 2.0", - "repository": "https://gitee.com/openharmony/startup_syspara_lite", - "publishAs": "code-segment", - "segment": { - "destPath": "base/startup/syspara_lite" - }, - "dirs": {}, - "scripts": {}, - "component": { - "name": "startup_l2", - "subsystem": "startup", - "adapted_system_type": [ - "standard" - ], - "rom": "", - "ram": "", - "deps": { - "components": [ - "init", - "utils_base" - ], - "third_party": [ - "bounds_checking_function", - "mbedtls" - ] - }, - "build": { - "sub_component": [ - "//base/startup/syspara_lite:syspara_group" - ], - "inner_kits": [ - { - "header": { - "header_base": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/", - "header_files": [ - "parameter.h" - ] - }, - "name": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara" - }, - { - "header": { - "header_base": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/", - "header_files": [ - "parameter.h" - ] - }, - "name": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara_watchagent" - } - ] - } - } +{ + "name": "@ohos/startup_syspara_lite", + "description": "ohos parameter manager", + "homePage": "https://gitee.com/openharmony", + "version": "3.1", + "license": "Apache License 2.0", + "repository": "https://gitee.com/openharmony/startup_syspara_lite", + "publishAs": "code-segment", + "segment": { + "destPath": "base/startup/syspara_lite" + }, + "dirs": {}, + "scripts": {}, + "component": { + "name": "startup_l2", + "subsystem": "startup", + "adapted_system_type": [ + "standard" + ], + "rom": "", + "ram": "", + "deps": { + "components": [ + "init", + "c_utils" + ], + "third_party": [ + "bounds_checking_function", + "mbedtls" + ] + }, + "build": { + "sub_component": [ + "//base/startup/syspara_lite:syspara_group" + ], + "inner_kits": [ + { + "header": { + "header_base": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/", + "header_files": [ + "parameter.h" + ] + }, + "name": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara" + }, + { + "header": { + "header_base": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/", + "header_files": [ + "parameter.h" + ] + }, + "name": "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara_watchagent" + } + ] + } + } } \ No newline at end of file diff --git a/frameworks/bundle.json b/frameworks/bundle.json index 0422778..8093b92 100644 --- a/frameworks/bundle.json +++ b/frameworks/bundle.json @@ -1,39 +1,39 @@ -{ - "name": "@ohos/startup_syspara_lite", - "description": "ohos lite parameter manager", - "homePage": "https://gitee.com/openharmony", - "version": "3.1", - "license": "Apache License 2.0", - "repository": "https://gitee.com/openharmony/startup_syspara_lite", - "publishAs": "code-segment", - "segment": { - "destPath": "base/startup/syspara_lite" - }, - "dirs": {}, - "scripts": {}, - "component": { - "name": "syspara_lite", - "subsystem": "startup", - "adapted_system_type": [ - "small" - ], - "rom": "23KB", - "ram": "", - "deps": { - "components": [ - "utils_base" - ], - "third_party": [ - "bounds_checking_function" - ] - }, - "build": { - "sub_component": [ - "//base/startup/syspara_lite/frameworks/parameter" - ], - "test": [ - "//base/startup/syspara_lite/frameworks/unittest/parameter:unittest" - ] - } - } +{ + "name": "@ohos/startup_syspara_lite", + "description": "ohos lite parameter manager", + "homePage": "https://gitee.com/openharmony", + "version": "3.1", + "license": "Apache License 2.0", + "repository": "https://gitee.com/openharmony/startup_syspara_lite", + "publishAs": "code-segment", + "segment": { + "destPath": "base/startup/syspara_lite" + }, + "dirs": {}, + "scripts": {}, + "component": { + "name": "syspara_lite", + "subsystem": "startup", + "adapted_system_type": [ + "small" + ], + "rom": "23KB", + "ram": "", + "deps": { + "components": [ + "c_utils" + ], + "third_party": [ + "bounds_checking_function" + ] + }, + "build": { + "sub_component": [ + "//base/startup/syspara_lite/frameworks/parameter" + ], + "test": [ + "//base/startup/syspara_lite/frameworks/unittest/parameter:unittest" + ] + } + } } \ No newline at end of file diff --git a/frameworks/unittest/BUILD.gn b/frameworks/unittest/BUILD.gn index 91df0b3..4a75957 100644 --- a/frameworks/unittest/BUILD.gn +++ b/frameworks/unittest/BUILD.gn @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # 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. +# limitations under the License. import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") diff --git a/hals/parameter/BUILD.gn b/hals/parameter/BUILD.gn index c944458..fb3f709 100644 --- a/hals/parameter/BUILD.gn +++ b/hals/parameter/BUILD.gn @@ -41,7 +41,7 @@ ohos_shared_library("sysparam_hal") { "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/openssl:libcrypto_shared", ] - external_deps = [ "utils_base:utils" ] + external_deps = [ "c_utils:utils" ] subsystem_name = "startup" part_name = "startup_l2" install_images = [ diff --git a/interfaces/innerkits/native/syspara/BUILD.gn b/interfaces/innerkits/native/syspara/BUILD.gn index 61e7667..baa142e 100644 --- a/interfaces/innerkits/native/syspara/BUILD.gn +++ b/interfaces/innerkits/native/syspara/BUILD.gn @@ -22,7 +22,7 @@ declare_args() { config("syspara_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/startup/syspara_lite/hals/parameter/include", "include", "//third_party/openssl/include/", @@ -44,16 +44,14 @@ ohos_shared_library("syspara") { ] configs = [ ":syspara_config" ] public_configs = [ ":syspara_public_config" ] - deps = [ - "//base/startup/init/interfaces/innerkits:libbegetutil_static", - "//utils/native/base:utils", - ] + deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil_static" ] subsystem_name = "startup" part_name = "startup_l2" install_images = [ "system", "updater", ] + external_deps = [ "c_utils:utils" ] } ohos_shared_library("syspara_watchagent") { @@ -66,12 +64,10 @@ ohos_shared_library("syspara_watchagent") { configs = [ ":syspara_config" ] public_configs = [ ":syspara_public_config" ] if (paramapi_feature_watcher) { - deps = [ - "//base/startup/init/interfaces/innerkits:libbeget_proxy", - "//utils/native/base:utils", - ] + deps = [ "//base/startup/init/interfaces/innerkits:libbeget_proxy" ] } else { defines = [ "NO_PARAM_WATCHER" ] + external_deps = [ "c_utils:utils" ] } subsystem_name = "startup" part_name = "startup_l2"