From a8026d5b82c56cb1fe6eb33093968bdd81c63267 Mon Sep 17 00:00:00 2001 From: chen Date: Wed, 27 Jul 2022 11:24:43 +0800 Subject: [PATCH] modify samgr Signed-off-by: chen Change-Id: Ie5422ce26dea1d09a7afa9199a46a98a637b97fa --- frameworks/native/miscdevice/BUILD.gn | 8 ++++---- interfaces/native/vibrator/BUILD.gn | 4 ++-- interfaces/native/vibrator/test/BUILD.gn | 4 ++-- interfaces/plugin/BUILD.gn | 4 ++-- services/miscdevice_service/BUILD.gn | 4 ++-- utils/BUILD.gn | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frameworks/native/miscdevice/BUILD.gn b/frameworks/native/miscdevice/BUILD.gn index 90535fb..5f4726c 100644 --- a/frameworks/native/miscdevice/BUILD.gn +++ b/frameworks/native/miscdevice/BUILD.gn @@ -24,7 +24,7 @@ ohos_shared_library("liblight_native") { include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", "//utils/jni/jnikit/include", @@ -33,12 +33,12 @@ ohos_shared_library("liblight_native") { deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils" ] external_deps = [ + "c_utils:utils", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "utils_base:utils", ] part_name = "miscdevice" subsystem_name = "sensors" @@ -53,7 +53,7 @@ ohos_shared_library("libvibrator_native") { include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", "//utils/jni/jnikit/include", @@ -62,13 +62,13 @@ ohos_shared_library("libvibrator_native") { deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils" ] external_deps = [ + "c_utils:utils", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "utils_base:utils", ] part_name = "miscdevice" subsystem_name = "sensors" diff --git a/interfaces/native/vibrator/BUILD.gn b/interfaces/native/vibrator/BUILD.gn index 4bdb94c..48349c1 100644 --- a/interfaces/native/vibrator/BUILD.gn +++ b/interfaces/native/vibrator/BUILD.gn @@ -38,7 +38,7 @@ ohos_shared_library("vibrator_interface_native") { include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/sensors/miscdevice/utils/include", "//base/sensors/miscdevice/frameworks/native/miscdevice/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -52,9 +52,9 @@ ohos_shared_library("vibrator_interface_native") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "utils_base:utils", ] public_configs = [ ":vibrator_config" ] diff --git a/interfaces/native/vibrator/test/BUILD.gn b/interfaces/native/vibrator/test/BUILD.gn index b363455..8c854c2 100755 --- a/interfaces/native/vibrator/test/BUILD.gn +++ b/interfaces/native/vibrator/test/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("VibratorAgentTest") { sources = [ "unittest/vibrator_agent_test.cpp" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", "$SUBSYSTEM_DIR/miscdevice/interfaces/native/vibrator/include", ] @@ -33,12 +33,12 @@ ohos_unittest("VibratorAgentTest") { "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/interfaces/plugin/BUILD.gn b/interfaces/plugin/BUILD.gn index 565142f..0706034 100644 --- a/interfaces/plugin/BUILD.gn +++ b/interfaces/plugin/BUILD.gn @@ -20,7 +20,7 @@ ohos_shared_library("vibrator") { "../native/vibrator/include", "./include", "./vibrator/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/sensors/miscdevice/utils/include", ] defines = [ @@ -35,9 +35,9 @@ ohos_shared_library("vibrator") { deps = [ "//base/sensors/miscdevice/interfaces/native/vibrator:vibrator_interface_native" ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "napi:ace_napi", - "utils_base:utils", ] relative_install_dir = "module" part_name = "miscdevice" diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 64768e8..1aefa06 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -26,7 +26,7 @@ ohos_shared_library("libmiscdevice_service") { include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/miscdevice/frameworks/native/miscdevice/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", @@ -39,6 +39,7 @@ ohos_shared_library("libmiscdevice_service") { external_deps = [ "access_token:libaccesstoken_sdk", + "c_utils:utils", "drivers_interface_vibrator:libvibrator_proxy_1.1", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", @@ -46,7 +47,6 @@ ohos_shared_library("libmiscdevice_service") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "utils_base:utils", ] part_name = "miscdevice" diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 1061932..30bbaa6 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -20,19 +20,19 @@ ohos_shared_library("libmiscdevice_utils") { include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", ] external_deps = [ "access_token:libaccesstoken_sdk", + "c_utils:utils", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "utils_base:utils", ] part_name = "miscdevice" subsystem_name = "sensors" -- Gitee