From 81ff4b7c4026bc0b3f7156b1e41e707393d1fc90 Mon Sep 17 00:00:00 2001 From: wenlong12 Date: Tue, 22 Mar 2022 15:06:18 +0800 Subject: [PATCH 1/3] fix cyclic dependence issue Signed-off-by: wenlong12 Signed-off-by: wenlong12 --- interfaces/innerkits/BUILD.gn | 4 +++- interfaces/innerkits/native/BUILD.gn | 4 ++-- interfaces/kits/BUILD.gn | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 4c9f44a..a2cc199 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 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 @@ -15,4 +15,6 @@ import("//build/ohos.gni") group("innerkits_target") { deps = [ "native:bytrace_core" ] + subsystem_name = "developtools" + part_name = "bytrace_standard" } diff --git a/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn index 46eb8b9..943b31e 100644 --- a/interfaces/innerkits/native/BUILD.gn +++ b/interfaces/innerkits/native/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 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 @@ -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("//build/ohos.gni") import("//developtools/bytrace_standard/bytrace.gni") diff --git a/interfaces/kits/BUILD.gn b/interfaces/kits/BUILD.gn index 8c4bba5..7630827 100644 --- a/interfaces/kits/BUILD.gn +++ b/interfaces/kits/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2021-2022 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 @@ -19,5 +19,7 @@ group("jsapi_kits_target") { "js/napi:bytrace", "js/napi:hitracemeter_napi", ] + subsystem_name = "developtools" + part_name = "bytrace_standard" } } From 3c8ffcd29f513ea19f4d5b23b6209016b626de23 Mon Sep 17 00:00:00 2001 From: wenlong12 Date: Fri, 25 Mar 2022 16:33:35 +0800 Subject: [PATCH 2/3] fix codecheck issues Signed-off-by: wenlong12 Signed-off-by: wenlong12 --- LICENSE | 1 - OAT.xml | 2 +- bin/BUILD.gn | 0 bin/include/bytrace_capture.h | 8 ++++---- .../unittest/common/native/bytrace_ndk_test.cpp | 6 +++--- figures/architecture_zh.png | Bin 0 -> 8111 bytes interfaces/innerkits/native/include/bytrace.h | 8 ++++---- interfaces/kits/js/napi/BUILD.gn | 4 ++-- interfaces/kits/js/napi/bytrace.cpp | 2 +- interfaces/kits/js/napi/declare_napi.cpp | 2 +- interfaces/kits/js/napi/declare_napi.h | 8 ++++---- interfaces/kits/js/napi/hitracemeter.cpp | 2 +- 12 files changed, 21 insertions(+), 22 deletions(-) mode change 100755 => 100644 bin/BUILD.gn create mode 100644 figures/architecture_zh.png diff --git a/LICENSE b/LICENSE index e454a52..f433b1a 100644 --- a/LICENSE +++ b/LICENSE @@ -175,4 +175,3 @@ of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - diff --git a/OAT.xml b/OAT.xml index 3a86653..5f35fc7 100644 --- a/OAT.xml +++ b/OAT.xml @@ -1,5 +1,5 @@ -