From 2547f9d80f46f65915a749bd2e49f35ec58669b1 Mon Sep 17 00:00:00 2001 From: wuzhihuitmac Date: Mon, 5 Sep 2022 03:40:01 +0000 Subject: [PATCH 1/2] Simplify the gn Signed-off-by: wuzhihuitmac Change-Id: Ida2cf45008adcc4d78c87b1af3b2fed10405488e --- frameworks/native/miscdevice/BUILD.gn | 3 --- services/miscdevice_service/BUILD.gn | 2 -- utils/BUILD.gn | 8 -------- 3 files changed, 13 deletions(-) diff --git a/frameworks/native/miscdevice/BUILD.gn b/frameworks/native/miscdevice/BUILD.gn index 3002507..058b59e 100644 --- a/frameworks/native/miscdevice/BUILD.gn +++ b/frameworks/native/miscdevice/BUILD.gn @@ -37,7 +37,6 @@ ohos_shared_library("liblight_native") { "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] part_name = "miscdevice" @@ -59,7 +58,6 @@ ohos_shared_library("libvibrator_native") { "//utils/jni/jnikit/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] - deps = [ "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils" ] external_deps = [ "c_utils:utils", @@ -67,7 +65,6 @@ ohos_shared_library("libvibrator_native") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] part_name = "miscdevice" diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index c212524..8fea913 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("libmiscdevice_service") { "$SUBSYSTEM_DIR/miscdevice/utils/include", "hdi_connection/adpter/include", "hdi_connection/interface/include", - "//third_party/cJSON", ] cflags = [ "-Wno-error=inconsistent-missing-override" ] @@ -49,7 +48,6 @@ ohos_shared_library("libmiscdevice_service") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] part_name = "miscdevice" diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 2ba19c5..18ef43b 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -24,20 +24,12 @@ ohos_shared_library("libmiscdevice_utils") { "include", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", - "//third_party/cJSON", ] - deps = [ "//third_party/cJSON:cjson_static" ] - 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:samgr_proxy", ] part_name = "miscdevice" subsystem_name = "sensors" -- Gitee From 0f854ef8cc6d9b201217063a837455f0bbca87e5 Mon Sep 17 00:00:00 2001 From: wuzhihuitmac Date: Mon, 5 Sep 2022 11:17:11 +0000 Subject: [PATCH 2/2] add Signed-off-by: wuzhihuitmac Change-Id: I94471871c5a24f638e1d62d73e390d475f39eece --- services/miscdevice_service/BUILD.gn | 1 + utils/BUILD.gn | 3 +++ 2 files changed, 4 insertions(+) diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 8fea913..f83b144 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -34,6 +34,7 @@ ohos_shared_library("libmiscdevice_service") { "$SUBSYSTEM_DIR/miscdevice/utils/include", "hdi_connection/adpter/include", "hdi_connection/interface/include", + "//third_party/cJSON", ] cflags = [ "-Wno-error=inconsistent-missing-override" ] diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 18ef43b..3077862 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -24,8 +24,11 @@ ohos_shared_library("libmiscdevice_utils") { "include", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", + "//third_party/cJSON", ] + deps = [ "//third_party/cJSON:cjson_static" ] + external_deps = [ "access_token:libaccesstoken_sdk", "c_utils:utils", -- Gitee