hitrace部件不合规问题整改

Signed-off-by: shanghuanni <shanghuanni1@huawei.com>

cmd/BUILD.gn

@@ -17,7 +17,7 @@ config("hitrace_osal_inner_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "./include",
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
+    "../interfaces/native/innerkits/include/hitrace_meter",
   ]
 }
 
@@ -43,7 +43,6 @@ ohos_executable("hitrace") {
 
   include_dirs = [
     "./include",
-    "//commonlibrary/c_utils/base/include",
     "//third_party/zlib",
   ]
   subsystem_name = "hiviewdfx"

frameworks/native/BUILD.gn

@@ -15,9 +15,7 @@ import("//build/ohos.gni")
 
 ohos_source_set("hitracechain_source") {
   include_dirs = [
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include",
-    "//base/hiviewdfx/hilog/frameworks/native/include",
-    "//commonlibrary/c_utils/base/include",
+    "../../interfaces/native/innerkits/include",
   ]
 
   sources = [

interfaces/js/kits/BUILD.gn

@@ -17,8 +17,8 @@ group("hitrace_napi") {
   deps = []
   if (support_jsapi) {
     deps += [
-      "//base/hiviewdfx/hitrace/interfaces/js/kits/napi:hitracechain_napi",
-      "//base/hiviewdfx/hitrace/interfaces/js/kits/napi:hitracemeter_napi",
+      "napi:hitracechain_napi",
+      "napi:hitracemeter_napi",
     ]
   }
 }

interfaces/native/innerkits/BUILD.gn

@@ -66,7 +66,6 @@ ohos_shared_library("hitrace_meter") {
     ":libhitracechain",
   ]
   external_deps = [ "c_utils:utils" ]
-  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
   output_extension = "so"
 
   innerapi_tags = [

lite/BUILD.gn

@@ -15,17 +15,15 @@ import("//build/lite/config/component/lite_component.gni")
 import("//build/lite/ndk/ndk.gni")
 
 hitrace_sources = [
-  "//base/hiviewdfx/hitrace/frameworks/native/hitrace.cpp",
-  "//base/hiviewdfx/hitrace/frameworks/native/hitracec.c",
-  "//base/hiviewdfx/hitrace/frameworks/native/hitraceid.cpp",
+  "../frameworks/native/hitrace.cpp",
+  "../frameworks/native/hitracec.c",
+  "../frameworks/native/hitraceid.cpp",
 ]
 
 config("hitrace_config") {
   include_dirs = [
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits",
-    "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits",
-    "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits/hilog",
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include",
+    "../interfaces/native/innerkits",
+    "../interfaces/native/innerkits/include",
     "//third_party/bounds_checking_function/include",
   ]
 }
@@ -35,8 +33,10 @@ lite_library("hitrace") {
   sources = hitrace_sources
   public_configs = [ ":hitrace_config" ]
   public_deps = [
-    "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
+  external_deps = [
+    "hilog_lite:hilog_shared",
+  ]
   cflags = [ "-Wall" ]
 }

lite/test/BUILD.gn

@@ -14,16 +14,14 @@
 import("//build/lite/config/component/lite_component.gni")
 import("//build/lite/config/test.gni")
 
-hitrace_root_dir = "//base/hiviewdfx/hitrace"
+hitrace_root_dir = "../.."
 hitrace_code_dir = "${hitrace_root_dir}/frameworks/native"
 hitrace_test_dir = "${hitrace_root_dir}/test/unittest"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include",
-    "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits",
-    "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits/hilog",
+    "../../interfaces/native/innerkits/include",
     "//third_party/bounds_checking_function/include",
   ]
 }
@@ -37,9 +35,11 @@ unittest("HitraceCTest") {
   configs = [ ":module_private_config" ]
 
   public_deps = [
-    "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
+  external_deps = [
+    "hilog_lite:hilog_shared",
+  ]
 }
 
 unittest("HitraceCppTest") {
@@ -53,9 +53,11 @@ unittest("HitraceCppTest") {
   configs = [ ":module_private_config" ]
 
   public_deps = [
-    "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
+  external_deps = [
+    "hilog_lite:hilog_shared",
+  ]
 }
 
 group("unittest") {

test/BUILD.gn

@@ -18,9 +18,7 @@ module_output_path = "hiviewdfx/hitrace"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include",
-    "//base/hiviewdfx/hilog/frameworks/native/include",
-    "//commonlibrary/c_utils/base/include",
+    "../interfaces/native/innerkits/include",
   ]
 }
 
@@ -28,7 +26,7 @@ ohos_unittest("HitraceCTest") {
   module_out_path = module_output_path
 
   sources = [
-    "//base/hiviewdfx/hitrace/frameworks/native/hitracechainc.c",
+    "../frameworks/native/hitracechainc.c",
     "unittest/common/native/hitracechainc_test.cpp",
   ]
 
@@ -46,9 +44,9 @@ ohos_unittest("HitraceCppTest") {
   module_out_path = module_output_path
 
   sources = [
-    "//base/hiviewdfx/hitrace/frameworks/native/hitracechain.cpp",
-    "//base/hiviewdfx/hitrace/frameworks/native/hitracechainc.c",
-    "//base/hiviewdfx/hitrace/frameworks/native/hitraceid.cpp",
+    "../frameworks/native/hitracechain.cpp",
+    "../frameworks/native/hitracechainc.c",
+    "../frameworks/native/hitraceid.cpp",
     "unittest/common/native/hitracechaincpp_test.cpp",
   ]
 
@@ -66,8 +64,8 @@ config("HitraceNDKTest_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//base/hiviewdfx/hitrace/cmd/include",
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
+    "../cmd/include",
+    "../interfaces/native/innerkits/include/hitrace_meter",
   ]
 }
 
@@ -79,9 +77,9 @@ ohos_unittest("HitraceNDKTest") {
   configs = [ ":HitraceNDKTest_config" ]
 
   deps = [
-    "//base/hiviewdfx/hitrace/cmd:hitrace_osal_inner",
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits:hitrace_meter",
-    "//base/hiviewdfx/hitrace/interfaces/native/innerkits:libhitracechain",
+    "../cmd:hitrace_osal_inner",
+    "../interfaces/native/innerkits:hitrace_meter",
+    "../interfaces/native/innerkits:libhitracechain",
     "//third_party/googletest:gtest_main",
   ]