openharmony/developtools_profiler
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_profiler synced 2024-11-23 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!996 修改profiler依赖的hilog部件名

Browse Source 
Merge pull request !996 from wenlong_12/profiler0620
This commit is contained in:
openharmony_ci 2023-06-21 11:24:49 +00:00 committed by Gitee
commit ada78a1abf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
59 changed files with 96 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bundle.json
View File

@ -25,36 +25,35 @@
"ram": "2000KB",
"deps": {
"components": [
"hiviewdfx_hilog_native",
"ability_runtime",
"ability_base",
"common",
"zlib",
"hidumper",
"bundle_framework",
"hiview",
"bounds_checking_function",
"ipc",
"init",
"hilog_native",
"napi",
"samgr",
"bundle_framework",
"common",
"common_event_service",
"c_utils",
"faultloggerd",
"common_event_service",
"hidumper",
"hilog",
"hiview",
"ipc",
"init",
"napi",
"safwk",
"selinux"
"samgr",
"selinux",
"zlib"
],
"third_party": [
"googletest",
"utils",
"zlib",
"bounds_checking_function",
"protobuf",
"openssl",
"libbpf",
"googletest",
"grpc",
"thirdparty_selinux"
"libbpf",
"openssl",
"protobuf",
"thirdparty_selinux",
"utils",
"zlib"
]
},
"build": {

6
device/base/BUILD.gn
View File

@ -84,10 +84,6 @@ ohos_source_set("hiprofiler_base") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps += [ "shared_library:libhilog" ]
} else {
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps += [ "hilog:libhilog" ]
}
}

2
device/base/test/BUILD.gn
View File

@ -40,7 +40,7 @@ ohos_unittest("hiprofiler_base_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
}

2
device/cmds/test/BUILD.gn
View File

@ -62,7 +62,7 @@ ohos_unittest("hiprofiler_cmd_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

12
device/plugins/api/BUILD.gn
View File

@ -60,11 +60,7 @@ ohos_source_set("plugins_sources") {
"${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config",
]
if (current_toolchain != host_toolchain) {
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
}
@ -84,11 +80,7 @@ ohos_executable("hiprofiler_plugins") {
sources = [ "src/main.cpp" ]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
install_enable = true
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

2
device/plugins/api/test/BUILD.gn
View File

@ -47,7 +47,7 @@ ohos_unittest("hiprofiler_plugins_ut") {
"unittest/writer_adapter_test.cpp",
]
configs = [ ":cflags_config" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
}

2
device/plugins/api/test/fuzztest/plugincreatesessioncmd_fuzzer/BUILD.gn
View File

@ -33,7 +33,7 @@ ohos_fuzztest("PluginCreateSessionCmdFuzzTest") {
#"${OHOS_PROFILER_DIR}/device/services/profiler_service:profiler_service",
"../../..:plugins_sources",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/plugins/api/test/fuzztest/plugindestroysessioncmd_fuzzer/BUILD.gn
View File

@ -33,7 +33,7 @@ ohos_fuzztest("PluginDestroySessionCmdFuzzTest") {
#"${OHOS_PROFILER_DIR}/device/services/profiler_service:profiler_service",
"../../..:plugins_sources",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/plugins/api/test/fuzztest/pluginstartsessioncmd_fuzzer/BUILD.gn
View File

@ -33,7 +33,7 @@ ohos_fuzztest("PluginStartSessionCmdFuzzTest") {
#"${OHOS_PROFILER_DIR}/device/services/profiler_service:profiler_service",
"../../..:plugins_sources",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/plugins/api/test/fuzztest/pluginstopsessioncmd_fuzzer/BUILD.gn
View File

@ -33,7 +33,7 @@ ohos_fuzztest("PluginStopSessionCmdFuzzTest") {
#"${OHOS_PROFILER_DIR}/device/services/profiler_service:profiler_service",
"../../..:plugins_sources",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

6
device/plugins/bytrace_plugin/BUILD.gn
View File

@ -38,11 +38,7 @@ ohos_shared_library("bytraceplugin") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
install_enable = false
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

12
device/plugins/cpu_plugin/BUILD.gn
View File

@ -36,11 +36,7 @@ ohos_source_set("cpudataplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
}
@ -71,11 +67,7 @@ ohos_executable("cpudataplugintest") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
install_enable = false
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

2
device/plugins/cpu_plugin/test/BUILD.gn
View File

@ -44,7 +44,7 @@ ohos_unittest("cpudataplugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

12
device/plugins/diskio_plugin/BUILD.gn
View File

@ -37,11 +37,7 @@ ohos_source_set("diskiodataplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
}
@ -70,11 +66,7 @@ ohos_executable("diskiodataplugintest") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
install_enable = false
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

2
device/plugins/diskio_plugin/test/BUILD.gn
View File

@ -44,7 +44,7 @@ ohos_unittest("diskiodataplugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/plugins/ftrace_plugin/BUILD.gn
View File

@ -53,11 +53,7 @@ ohos_source_set("ftrace_plugin_source") {
]
if (current_toolchain != host_toolchain) {
defines += [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

2
device/plugins/ftrace_plugin/test/BUILD.gn
View File

@ -61,7 +61,7 @@ ohos_unittest("ftrace_plugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/plugins/ftrace_plugin/tools/device_kernel_version/default/event_formatters/BUILD.gn
View File

@ -37,11 +37,7 @@ ohos_source_set("ftrace_event_formatters") {
if (!is_mingw) {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs =
[ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]

6
device/plugins/ftrace_plugin/tools/device_kernel_version/default/event_parsers/BUILD.gn
View File

@ -30,11 +30,7 @@ ohos_source_set("ftrace_event_parsers") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

6
device/plugins/hidump_plugin/BUILD.gn
View File

@ -33,11 +33,7 @@ ohos_source_set("hidumpplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

2
device/plugins/hidump_plugin/test/BUILD.gn
View File

@ -43,7 +43,7 @@ ohos_unittest("hidumpplugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/plugins/hiebpf_plugin/BUILD.gn
View File

@ -32,11 +32,7 @@ ohos_source_set("hiebpfplugin_source") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/plugins/hilog_plugin/BUILD.gn
View File

@ -37,11 +37,7 @@ ohos_source_set("hilogplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
}

2
device/plugins/hilog_plugin/test/BUILD.gn
View File

@ -43,7 +43,7 @@ ohos_unittest("hilogplugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/plugins/hiperf_plugin/BUILD.gn
View File

@ -39,11 +39,7 @@ ohos_source_set("hiperfplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

2
device/plugins/hiperf_plugin/test/BUILD.gn
View File

@ -44,7 +44,7 @@ ohos_unittest("hiperfplugin_ut") {
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"hilog:libhilog",
]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

6
device/plugins/hisysevent_plugin/BUILD.gn
View File

@ -37,11 +37,7 @@ ohos_source_set("hisyseventplugin_source") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
}

2
device/plugins/hisysevent_plugin/test/BUILD.gn
View File

@ -43,7 +43,7 @@ ohos_unittest("hisyseventplugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

12
device/plugins/memory_plugin/BUILD.gn
View File

@ -37,11 +37,7 @@ ohos_source_set("memdataplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
}
@ -68,11 +64,7 @@ ohos_executable("memorytest") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
install_enable = false
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

4
device/plugins/memory_plugin/test/BUILD.gn
View File

@ -48,7 +48,7 @@ ohos_unittest("memdataplugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"
@ -76,7 +76,7 @@ ohos_unittest("smaps_stats_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
resource_config_file = "${OHOS_PROFILER_DIR}/device/ohos_test.xml"

6
device/plugins/native_daemon/BUILD.gn
View File

@ -94,11 +94,7 @@ ohos_executable("native_daemon") {
external_deps = [ "init:libbegetutil" ]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps += [ "shared_library:libhilog" ]
} else {
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps += [ "hilog:libhilog" ]
}
use_exceptions = true
install_enable = true

2
device/plugins/native_daemon/test/BUILD.gn
View File

@ -121,7 +121,7 @@ ohos_unittest("native_daemon_ut") {
}
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
}

36
device/plugins/native_hook/BUILD.gn
View File

@ -69,11 +69,7 @@ ohos_source_set("native_hook_source") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps += [ "shared_library:libhilog" ]
} else {
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps += [ "hilog:libhilog" ]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"
@ -103,11 +99,7 @@ ohos_executable("nativetest_c") {
if (use_musl && !is_asan) {
defines += [ "HOOK_ENABLE" ]
}
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
include_dirs = [ "//third_party/bounds_checking_function/include" ]
deps = [ "//third_party/bounds_checking_function:libsec_static" ]
@ -127,11 +119,7 @@ ohos_executable("nativetest_cpp") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
cflags = [
@ -151,11 +139,7 @@ ohos_shared_library("nativetest_so") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
cflags = [
@ -174,11 +158,7 @@ ohos_executable("malloctest_cpp") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
include_dirs = [ "//third_party/bounds_checking_function/include" ]
@ -200,11 +180,7 @@ ohos_executable("perf_test_data") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
cflags = [ "-Wno-error=inline-asm" ]

2
device/plugins/native_hook/test/BUILD.gn
View File

@ -74,7 +74,7 @@ ohos_unittest("nativehook_ut") {
"-Dprotected=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/plugins/network_plugin/BUILD.gn
View File

@ -37,11 +37,7 @@ ohos_source_set("networkplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
}

2
device/plugins/network_plugin/test/BUILD.gn
View File

@ -45,7 +45,7 @@ ohos_unittest("networkplugin_ut") {
"-Dprotected=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
resource_config_file = "${OHOS_PROFILER_DIR}/device/ohos_test.xml"

6
device/plugins/process_plugin/BUILD.gn
View File

@ -35,11 +35,7 @@ ohos_source_set("processplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

2
device/plugins/process_plugin/test/BUILD.gn
View File

@ -43,7 +43,7 @@ ohos_unittest("processplugin_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/plugins/sample_plugin/BUILD.gn
View File

@ -33,11 +33,7 @@ ohos_shared_library("sampleplugin") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
install_enable = false

6
device/plugins/stream_plugin/BUILD.gn
View File

@ -32,11 +32,7 @@ ohos_source_set("streamplugin_source") {
]
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"

6
device/services/ipc/BUILD.gn
View File

@ -35,11 +35,7 @@ ohos_source_set("ipc") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps += [ "shared_library:libhilog" ]
} else {
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps += [ "hilog:libhilog" ]
}
deps = [
"${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite_static",

2
device/services/ipc/test/BUILD.gn
View File

@ -48,7 +48,7 @@ ohos_unittest("ipc_ut") {
"-Dprivate=public", #allow test code access private members
"-Dprotected=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
}

6
device/services/plugin_service/BUILD.gn
View File

@ -39,10 +39,6 @@ ohos_source_set("hiprofiler_plugin_service") {
public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
deps = [ "../../base:hiprofiler_base" ]
if (current_toolchain != host_toolchain) {
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
}

4
device/services/plugin_service/test/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_unittest("plugin_service_ut") {
"-Dprivate=public", #allow test code access private members
"-Dprotected=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
}
@ -62,7 +62,7 @@ ohos_unittest("plugin_service_module_test") {
"-Dprivate=public", #allow test code access private members
"-Dprotected=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
}

12
device/services/profiler_service/BUILD.gn
View File

@ -52,11 +52,7 @@ ohos_source_set("profiler_service") {
"${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config",
]
if (current_toolchain != host_toolchain) {
if (build_l2) {
external_deps = [ "hilog:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
}
@ -93,11 +89,7 @@ ohos_executable("hiprofilerd") {
"../plugin_service:hiprofiler_plugin_service",
]
if (current_toolchain != host_toolchain) {
if (build_l2) {
external_deps = [ "shared_library:libhilog" ]
} else {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
external_deps = [ "hilog:libhilog" ]
}
install_enable = true
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

2
device/services/profiler_service/test/BUILD.gn
View File

@ -58,7 +58,7 @@ ohos_unittest("profiler_service_ut") {
]
configs = [ ":cflags_config" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
}

2
device/services/profiler_service/test/fuzztest/profilercreatesession_fuzzer/BUILD.gn
View File

@ -37,7 +37,7 @@ ohos_fuzztest("ProfilerCreateSessionFuzzTest") {
"../../..:profiler_service",
"../../../../plugin_service:hiprofiler_plugin_service",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/services/profiler_service/test/fuzztest/profilerdestroysession_fuzzer/BUILD.gn
View File

@ -37,7 +37,7 @@ ohos_fuzztest("ProfilerDestroySessionFuzzTest") {
"../../..:profiler_service",
"../../../../plugin_service:hiprofiler_plugin_service",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/services/profiler_service/test/fuzztest/profilerfetchdata_fuzzer/BUILD.gn
View File

@ -38,7 +38,7 @@ ohos_fuzztest("ProfilerFetchDataFuzzTest") {
"../../..:profiler_service",
"../../../../plugin_service:hiprofiler_plugin_service",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/services/profiler_service/test/fuzztest/profilergetcapabilities_fuzzer/BUILD.gn
View File

@ -37,7 +37,7 @@ ohos_fuzztest("ProfilerGetCapabilitiesFuzzTest") {
"../../..:profiler_service",
"../../../../plugin_service:hiprofiler_plugin_service",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/services/profiler_service/test/fuzztest/profilerkeepsession_fuzzer/BUILD.gn
View File

@ -37,7 +37,7 @@ ohos_fuzztest("ProfilerKeepSessionFuzzTest") {
"../../..:profiler_service",
"../../../../plugin_service:hiprofiler_plugin_service",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/services/profiler_service/test/fuzztest/profilerstartsession_fuzzer/BUILD.gn
View File

@ -37,7 +37,7 @@ ohos_fuzztest("ProfilerStartSessionFuzzTest") {
"../../..:profiler_service",
"../../../../plugin_service:hiprofiler_plugin_service",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

2
device/services/profiler_service/test/fuzztest/profilerstopsession_fuzzer/BUILD.gn
View File

@ -37,7 +37,7 @@ ohos_fuzztest("ProfilerStopSessionFuzzTest") {
"../../..:profiler_service",
"../../../../plugin_service:hiprofiler_plugin_service",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
}
###############################################################################

30
device/services/shared_memory/BUILD.gn
View File

@ -41,17 +41,10 @@ ohos_source_set("shared_memory_source") {
if (current_toolchain != host_toolchain) {
defines = [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [
"c_utils:utils",
"shared_library:libhilog",
]
} else {
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
]
}
external_deps = [
"c_utils:utils",
"hilog:libhilog",
]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"
@ -78,17 +71,10 @@ ohos_static_library("shared_memory_lite") {
if (current_toolchain != host_toolchain) {
defines += [ "HAVE_HILOG" ]
if (build_l2) {
external_deps = [
"c_utils:utils",
"shared_library::libhilog",
]
} else {
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
]
}
external_deps = [
"c_utils:utils",
"hilog:libhilog",
]
}
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"

2
device/services/shared_memory/test/BUILD.gn
View File

@ -45,7 +45,7 @@ ohos_unittest("shared_memory_ut") {
"-Dprivate=public", #allow test code access private members
"-Dprotected=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"
}

2
hidebug/frameworks/native/BUILD.gn
View File

@ -26,7 +26,7 @@ ohos_source_set("libhidebug_source") {
external_deps = [
"c_utils:utils",
"hilog_native:libhilog",
"hilog:libhilog",
"init:libbegetutil",
]
}

2
hidebug/interfaces/js/kits/napi/BUILD.gn
View File

@ -41,7 +41,7 @@ ohos_shared_library("hidebug") {
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"hidumper:lib_dump_usage",
"hilog_native:libhilog",
"hilog:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
"samgr:samgr_proxy",

2
hidebug/interfaces/native/innerkits/BUILD.gn
View File

@ -30,7 +30,7 @@ ohos_shared_library("libhidebug") {
}
external_deps = [
"hilog_native:libhilog",
"hilog:libhilog",
"init:libbegetutil",
]

2
hiebpf/test/BUILD.gn
View File

@ -54,7 +54,7 @@ ohos_unittest("hiebpf_ut") {
"-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
external_deps = [ "hilog:libhilog" ]
configs = [ ":module_private_config" ]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"