From bb8d0f100ecff749b2ddaa11f062451ba0dd13a8 Mon Sep 17 00:00:00 2001 From: jinmengtong Date: Sun, 25 Jun 2023 16:27:55 +0800 Subject: [PATCH] modify hilog Signed-off-by: jinmengtong --- bundle.json | 2 +- common/BUILD.gn | 4 ++-- frameworks/BUILD.gn | 2 +- frameworks/js/napi/crypto/BUILD.gn | 4 ++-- plugin/BUILD.gn | 2 +- .../fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn | 4 ++-- .../crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn | 4 ++-- .../fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn | 4 ++-- test/unittest/BUILD.gn | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bundle.json b/bundle.json index c450d38..5f09ee9 100644 --- a/bundle.json +++ b/bundle.json @@ -23,7 +23,7 @@ "ram": "", "deps": { "components": [ - "hiviewdfx_hilog_native", + "hilog", "c_utils", "napi" ], diff --git a/common/BUILD.gn b/common/BUILD.gn index 6602b75..39cb861 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -34,6 +34,6 @@ ohos_static_library("crypto_plugin_common") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index 5f9bd8f..3d7acb9 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -58,6 +58,6 @@ ohos_shared_library("crypto_framework_lib") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/frameworks/js/napi/crypto/BUILD.gn b/frameworks/js/napi/crypto/BUILD.gn index 2eaa95e..31a3c1e 100644 --- a/frameworks/js/napi/crypto/BUILD.gn +++ b/frameworks/js/napi/crypto/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. import("//base/security/crypto_framework/common/common.gni") import("//base/security/crypto_framework/frameworks/frameworks.gni") @@ -67,7 +67,7 @@ ohos_shared_library("cryptoframework_napi") { ] external_deps = [ - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", "napi:ace_napi", ] } diff --git a/plugin/BUILD.gn b/plugin/BUILD.gn index f8eb006..d6979b5 100644 --- a/plugin/BUILD.gn +++ b/plugin/BUILD.gn @@ -58,7 +58,7 @@ ohos_shared_library("crypto_openssl_plugin_lib") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] } diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn index fd6cdc1..58e0b46 100755 --- a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn +++ b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -35,7 +35,7 @@ ohos_fuzztest("HcfCipherCreateFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn index c78cc97..3c78359 100755 --- a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn +++ b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -35,7 +35,7 @@ ohos_fuzztest("HcfKeyAgreementCreateFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn index 70953df..5474818 100755 --- a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn +++ b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -35,7 +35,7 @@ ohos_fuzztest("HcfMacCreateFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn index aa14b9f..c6555dd 100755 --- a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn +++ b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -35,7 +35,7 @@ ohos_fuzztest("HcfMdCreateFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn index 2f98f0a..9aebc5b 100755 --- a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn +++ b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -35,7 +35,7 @@ ohos_fuzztest("HcfSignCreateFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn index 0a802b0..b76e945 100755 --- a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn +++ b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -35,7 +35,7 @@ ohos_fuzztest("HcfVerifyCreateFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn b/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn index 4e85922..f89aad9 100755 --- a/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn +++ b/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -38,7 +38,7 @@ ohos_fuzztest("AsyKeyGeneratorFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn b/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn index c096f5b..40bec61 100755 --- a/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn +++ b/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -50,7 +50,7 @@ ohos_fuzztest("SymKeyGeneratorFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn b/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn index c2e91a4..55c6049 100755 --- a/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn +++ b/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -37,7 +37,7 @@ ohos_fuzztest("HcfRandCreateFuzzTest") { external_deps = [ "c_utils:utils", "crypto_framework:crypto_framework_lib", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 8e0c4ef..b51196e 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -86,6 +86,6 @@ ohos_unittest("crypto_framework_test") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", ] } -- Gitee