diff --git a/bundle.json b/bundle.json index 8ace6a846b8c23cc2a8730c5a390bf0c222e56bd..00970feec896de32893b2dafde2725c8b7d64ea6 100644 --- a/bundle.json +++ b/bundle.json @@ -26,7 +26,7 @@ "c_utils", "drivers_interface_nnrt", "hdf_core", - "hilog_native", + "hilog", "hitrace", "mindspore" ], diff --git a/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn b/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn index f17b0ce35a34d7d02df8621d7b8b80e71c5b5fb9..a23a5c4a754197a0c10da7c23e12e98a425729e2 100644 --- a/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn +++ b/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn @@ -42,7 +42,7 @@ ohos_shared_library("libnnrt_device_service_1.0") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_1.0", "hdf_core:libhdf_utils", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] @@ -63,7 +63,7 @@ ohos_shared_library("libnnrt_driver") { "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] diff --git a/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn b/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn index 6ed9f68467f0ed57ff2d240f27cc73de001c0d60..8bada1b80f2b100477bbc358555d8516768242c3 100644 --- a/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn +++ b/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn @@ -42,7 +42,7 @@ ohos_shared_library("libnnrt_device_service_2.0") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdf_utils", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] @@ -63,7 +63,7 @@ ohos_shared_library("libnnrt_driver") { "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index 347d4f4906ada5eab8cc61ba68893f3dd67c115d..3263b30744e34976720faff11bc66a5581618490 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -124,7 +124,7 @@ ohos_shared_library("libneural_network_runtime") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", - "hilog_native:libhilog", + "hilog:libhilog", "hitrace:libhitracechain", "mindspore:mindir", ] diff --git a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn index 49bd2b8b160dfc2d02067c6beeb2349d0b82a4f6..d14bd878ed1c00ca70fc0a1b62ce95638eccf1db 100644 --- a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtdevice_fuzzer/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. #####################hydra-fuzz################### import("//build/config/features.gni") @@ -37,7 +37,7 @@ ohos_fuzztest("HdiNnrtDeviceFuzzTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] } diff --git a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn index 5eed6bdda709a22187b9ebc877568f3e087926ed..9688db0e3def1ed1c7c927e73504e2005a5a2130 100644 --- a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/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. #####################hydra-fuzz################### import("//build/config/features.gni") @@ -42,7 +42,7 @@ ohos_fuzztest("HdiNnrtPreparedModelFuzzTest") { "drivers_interface_nnrt:libnnrt_proxy_2.0", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", "mindspore:mindir", "neural_network_runtime:nnrt_target", diff --git a/test/system_test/BUILD.gn b/test/system_test/BUILD.gn index 2436d69032b5b244879a38b13277d28dbedeef13..95ef4a7ca70385c9bd4535f282dad801728cf4f7 100644 --- a/test/system_test/BUILD.gn +++ b/test/system_test/BUILD.gn @@ -45,8 +45,8 @@ ohos_systemtest("DeviceTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", ] } @@ -68,9 +68,9 @@ ohos_systemtest("End2EndTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } diff --git a/test/unittest/components/BUILD.gn b/test/unittest/components/BUILD.gn index 53e4ac9037b94b0ccc64ef08cf34f26bad634b9b..a9d0e3936702384f24fae423bd4c98f94c03c2a8 100644 --- a/test/unittest/components/BUILD.gn +++ b/test/unittest/components/BUILD.gn @@ -43,8 +43,8 @@ ohos_unittest("CompilationTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -66,8 +66,8 @@ ohos_unittest("ExecutorTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -88,8 +88,8 @@ ohos_unittest("DeviceManagerTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -110,8 +110,8 @@ ohos_unittest("DeviceRegistrarTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -133,8 +133,8 @@ ohos_unittest("HDIDeviceTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -156,8 +156,8 @@ ohos_unittest("HDIPreparedModelTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -177,8 +177,8 @@ ohos_unittest("MemoryManagerTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -197,8 +197,8 @@ ohos_unittest("TransformTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -220,8 +220,8 @@ ohos_unittest("InnerModelTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -242,8 +242,8 @@ ohos_unittest("NnTensorTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -264,8 +264,8 @@ ohos_unittest("NnValidationTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -286,8 +286,8 @@ ohos_unittest("OpsRegistryTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -310,8 +310,8 @@ ohos_unittest("NeuralNetworkRuntimeTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } diff --git a/test/unittest/inner_kits/BUILD.gn b/test/unittest/inner_kits/BUILD.gn index be46c5fe351c7e51252a9295e56eda88442b5d80..68848df509cfd89735ad6520565d5dac35f71bb1 100644 --- a/test/unittest/inner_kits/BUILD.gn +++ b/test/unittest/inner_kits/BUILD.gn @@ -50,8 +50,8 @@ ohos_unittest("NeuralNetworkRuntimeInnerTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } diff --git a/test/unittest/ops/BUILD.gn b/test/unittest/ops/BUILD.gn index 4386b66fc7a7af7614ac1c8e493759c6c5c357ed..7f65e523bb170a3e57814a0bcc9c41305d04d1e6 100644 --- a/test/unittest/ops/BUILD.gn +++ b/test/unittest/ops/BUILD.gn @@ -105,8 +105,8 @@ ohos_unittest("OpsUnittest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] }