diff --git a/bundle.json b/bundle.json index c450d38932505914f35fd2c553ba10129882c666..5f09ee920ad679d75bda5abf8ef1157ba7ff900d 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 6602b7574319f6ec6d6a8f43842d995687ec8b3d..39cb861fea52cd9d08557e06f87d9eeed2117ae3 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 5f9bd8f184afe5c4a2d6f7350caf0811efcbfc95..3d7acb9f34f3c12fc2d720639c0d9300cda33e64 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 2eaa95e17b44c11a813d3a24033d2a2aa8ace2c3..31a3c1eb8d76d5da2cab3c780edf71b9b4bc2616 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 f8eb00697bb7200cc0e86c6b52391dbc71b2dcdd..d6979b59cd268f6aefd9f88a533761637c40747b 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 fd6cdc18d86b53378d324bdf76dc32b9a02a1eff..58e0b46156ad6652ee34c37ebe281294dd695b62 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 c78cc9748862fd6f9f6b9fafa841676465ce041c..3c783598dbbe56d078853b791105da1736e75789 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 70953dffc51d2fc8aa9140ab2de1ed8d3aa75a2f..547481821f69c8428a07755617c28cfe81ce745e 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 aa14b9f7b8a92074dbf35eaa167618348a74440e..c6555dd19ff05738c2b2cc6eee1098a7467a4a2e 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 2f98f0a1dc3062dbe246ec0bd5ed9fe1d7cbb282..9aebc5b8553beb9a6f8e386f28484227f86d9441 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 0a802b0d2053d0b867dff8c1c27d0b6097e8d70b..b76e945ff2d8c25414a1876d406aaadcb4d4b5d0 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 4e859223d43c50d2428c30230e14a95886b82465..f89aad9af5456d0dd0ebf45caf12aa517a8921be 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 c096f5bb57fddc34b98e82a466cfdf59cd70d558..40bec6139c0ecffa2be9872da66eaa692a570544 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 c2e91a4bede552dca9444c92533bb6f65ef92068..55c604979ec474a5d063410a4fe625f7fc591afb 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 8e0c4eff8dbf5ce444ee58fa74cfa0a7350b315e..b51196e1781dfde65dfe1cdb2ab14fbae2cb87cc 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", ] }