From a2693f9408873069e4172819bcae320e7a5a3bfc Mon Sep 17 00:00:00 2001 From: bailu1992 Date: Fri, 15 Mar 2024 19:57:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?gn=E6=96=87=E4=BB=B6=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bailu1992 --- bundle.json | 3 ++- frameworks/js/napi/BUILD.gn | 4 ++-- sensor.gni | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index c07c2ce8..040cd38f 100755 --- a/bundle.json +++ b/bundle.json @@ -30,7 +30,8 @@ "ipc", "safwk", "samgr", - "eventhandler" + "eventhandler", + "libuv" ], "third_party": [] }, diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 06fa4b15..9e86f586 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -20,8 +20,7 @@ ohos_shared_library("libsensor") { "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/frameworks/js/napi/include", "$SUBSYSTEM_DIR/utils/common/include", - "//third_party/libuv/include", - "//third_party/node/src", + "THERD_PARTY_NODE/src", ] defines = [ "APP_LOG_TAG = \"sensorJs\"", @@ -43,6 +42,7 @@ ohos_shared_library("libsensor") { external_deps = [ "c_utils:utils", "hilog:libhilog", + "libuv:uv", "napi:ace_napi", ] relative_install_dir = "module" diff --git a/sensor.gni b/sensor.gni index eb6290ef..290b01e6 100644 --- a/sensor.gni +++ b/sensor.gni @@ -21,6 +21,8 @@ SUBSYSTEM_DIR = "//base/sensors/sensor" FUZZ_MODULE_OUT_PATH = "sensor/sensor" +THERD_PARTY_NODE = "//third_party/node" + sensor_default_defines = [] if (rust_socket_ipc) { -- Gitee From 234be1eaeab095533387b01cb2eb9176f6684b49 Mon Sep 17 00:00:00 2001 From: bailu1992 Date: Thu, 21 Mar 2024 21:30:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?gn=E6=96=87=E4=BB=B6=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bailu1992 --- bundle.json | 3 +-- frameworks/js/napi/BUILD.gn | 2 -- sensor.gni | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index 040cd38f..c07c2ce8 100755 --- a/bundle.json +++ b/bundle.json @@ -30,8 +30,7 @@ "ipc", "safwk", "samgr", - "eventhandler", - "libuv" + "eventhandler" ], "third_party": [] }, diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 9e86f586..263d4b1f 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -20,7 +20,6 @@ ohos_shared_library("libsensor") { "$SUBSYSTEM_DIR/interfaces/inner_api", "$SUBSYSTEM_DIR/frameworks/js/napi/include", "$SUBSYSTEM_DIR/utils/common/include", - "THERD_PARTY_NODE/src", ] defines = [ "APP_LOG_TAG = \"sensorJs\"", @@ -42,7 +41,6 @@ ohos_shared_library("libsensor") { external_deps = [ "c_utils:utils", "hilog:libhilog", - "libuv:uv", "napi:ace_napi", ] relative_install_dir = "module" diff --git a/sensor.gni b/sensor.gni index 290b01e6..eb6290ef 100644 --- a/sensor.gni +++ b/sensor.gni @@ -21,8 +21,6 @@ SUBSYSTEM_DIR = "//base/sensors/sensor" FUZZ_MODULE_OUT_PATH = "sensor/sensor" -THERD_PARTY_NODE = "//third_party/node" - sensor_default_defines = [] if (rust_socket_ipc) { -- Gitee