hitrace部件化不规范修改

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

cmd/BUILD.gn

@@ -58,8 +58,7 @@ ohos_prebuilt_etc("hitrace.cfg") {
 
 ohos_executable("hitrace_example") {
   sources = [ "example/hitrace_example.cpp" ]
-
-  external_deps = [ "hitrace_native:hitrace_meter" ]
+  deps = [ "../interfaces/native/innerkits:hitrace_meter" ]
   install_enable = false
   subsystem_name = "hiviewdfx"
   part_name = "hitrace_native"

frameworks/native/c_wrapper/BUILD.gn

@@ -21,13 +21,8 @@ ohos_shared_library("hitracechain_c_wrapper") {
   ]
 
   sources = [ "./source/hitracechain_c_wrapper.c" ]
-
   deps = [ "../../../interfaces/native/innerkits:libhitracechain" ]
-
-  external_deps = [
-    "c_utils:utils",
-    "hitrace_native:libhitracechain",
-  ]
+  external_deps = [ "c_utils:utils" ]
 
   output_extension = "so"
 

interfaces/js/kits/napi/BUILD.gn

@@ -43,9 +43,9 @@ ohos_shared_library("hitracechain_napi") {
 
 ohos_shared_library("hitracemeter_napi") {
   sources = [ "./hitracemeter/napi_hitrace_meter.cpp" ]
+  deps = [ "../../../native/innerkits:hitrace_meter" ]
   external_deps = [
     "hilog_native:libhilog",
-    "hitrace_native:hitrace_meter",
     "napi:ace_napi",
   ]
 

interfaces/native/innerkits/BUILD.gn

@@ -59,10 +59,7 @@ ohos_static_library("hitrace_inner") {
 }
 
 ohos_shared_library("hitrace_dump") {
-  include_dirs = [
-    "./include",
-    "//commonlibrary/c_utils/base/include",
-  ]
+  include_dirs = [ "./include" ]
 
   sources = [ "./src/hitrace_dump.cpp" ]
 

interfaces/rust/innerkits/hitrace_meter/BUILD.gn

@@ -16,8 +16,7 @@ import("//build/ohos.gni")
 ohos_rust_shared_library("hitrace_meter_rust") {
   sources = [ "src/lib.rs" ]
 
-  external_deps = [ "hitrace_native:hitrace_meter" ]
-
+  deps = [ "../../../native/innerkits:hitrace_meter" ]
   crate_name = "hitrace_meter_rust"
   crate_type = "dylib"
 

interfaces/rust/innerkits/hitracechain/BUILD.gn

@@ -24,8 +24,6 @@ ohos_rust_shared_library("hitracechain_rust") {
     "../../../native/innerkits:libhitracechain",
   ]
 
-  external_deps = [ "hitrace_native:libhitracechain" ]
-
   crate_name = "hitracechain"
   crate_type = "dylib"