diff --git a/bundle.json b/bundle.json index c331df84c12e815b24c826ccd4e920c5fca992aa..197e29b798741946f4db4fcc149bfb1acef9d238 100755 --- a/bundle.json +++ b/bundle.json @@ -10,7 +10,7 @@ "name": "sensor", "subsystem": "sensors", "syscap": ["SystemCapability.Sensors.Sensor", "SystemCapability.Sensors.Sensor.Lite"], - "features": [], + "features": ["sensor_rust_socket_ipc"], "adapted_system_type": [ "standard" ], "rom": "2048KB", "ram": "~4096KB", diff --git a/frameworks/native/BUILD.gn b/frameworks/native/BUILD.gn index f7222ca6310c7d7a4d3ff58417dc673fc012a52b..865cd71951791ed3b90007c0a9b6c84711f5a440 100644 --- a/frameworks/native/BUILD.gn +++ b/frameworks/native/BUILD.gn @@ -47,7 +47,7 @@ ohos_shared_library("libsensor_client") { "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] - if (rust_socket_ipc) { + if (sensor_rust_socket_ipc) { deps += [ "$SUBSYSTEM_DIR/rust/utils/socket_ipc_rust_ffi:sensor_rust_util_ffi" ] } diff --git a/sensor.gni b/sensor.gni index 4306a82493993915a47e402827d6bb0d3a5e6be7..addc8d5221b745b3a961df3d23d9f203ebfe6ca5 100644 --- a/sensor.gni +++ b/sensor.gni @@ -14,7 +14,7 @@ import("//build/ohos.gni") declare_args() { - rust_socket_ipc = false + sensor_rust_socket_ipc = false } SUBSYSTEM_DIR = "//base/sensors/sensor" @@ -23,7 +23,7 @@ FUZZ_MODULE_OUT_PATH = "sensor/sensor" sensor_default_defines = [] -if (rust_socket_ipc) { +if (sensor_rust_socket_ipc) { sensor_default_defines += [ "OHOS_BUILD_ENABLE_RUST" ] } diff --git a/services/BUILD.gn b/services/BUILD.gn index f8b346c3af3103a89be453c46e2d749a19cb9b88..e2bca24f62e243491ff1caa5b6fb9a8ac66c39ac 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -49,7 +49,7 @@ ohos_shared_library("libsensor_service") { "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] - if (rust_socket_ipc) { + if (sensor_rust_socket_ipc) { deps += [ "$SUBSYSTEM_DIR/rust/utils/socket_ipc_rust_ffi:sensor_rust_util_ffi" ] } @@ -63,6 +63,7 @@ ohos_shared_library("libsensor_service") { "hitrace:hitrace_meter", "ipc:ipc_single", "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] if (sensor_memmgr_enable) { @@ -137,7 +138,7 @@ ohos_static_library("libsensor_service_static") { "$SUBSYSTEM_DIR/utils/ipc:libsensor_ipc", ] - if (rust_socket_ipc) { + if (sensor_rust_socket_ipc) { deps += [ "$SUBSYSTEM_DIR/rust/utils/socket_ipc_rust_ffi:sensor_rust_util_ffi" ] } @@ -151,6 +152,7 @@ ohos_static_library("libsensor_service_static") { "hitrace:hitrace_meter", "ipc:ipc_single", "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] if (sensor_memmgr_enable) { diff --git a/utils/ipc/BUILD.gn b/utils/ipc/BUILD.gn index 9bbc90d6e17fdd3fb34c8f19825587857a4f4364..a37332ae66b71c095bf6d6aaef5e4f1ba842a88c 100644 --- a/utils/ipc/BUILD.gn +++ b/utils/ipc/BUILD.gn @@ -37,7 +37,7 @@ ohos_shared_library("libsensor_ipc") { defines = sensor_default_defines - if (rust_socket_ipc) { + if (sensor_rust_socket_ipc) { deps = [ "$SUBSYSTEM_DIR/rust/utils/socket_ipc_rust_ffi:sensor_rust_util_ffi" ] }