openharmony/arkcompiler_toolchain
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_toolchain synced 2025-02-20 17:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IssueNo:#I65M0O

Browse Source 
Description:Change the dependency on cjson_static to cjson in standard system.
Sig:SIG_ApplicationFramework
Feature or BugFix: Feature
Binary Source: No

Signed-off-by: zhangyafei.echo <zhangyafei12@huawei.com>
Change-Id: I3d90e5b3fe997ffd03a0b8df88a719231dd4d74c
This commit is contained in:
zhangyafei.echo 2022-12-10 16:49:13 +08:00
parent c2fac5cab3
commit abfec029c1
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/test_helper.gni
View File

@ -54,6 +54,7 @@ template("host_unittest_action") {
rebase_path(_root_out_dir_) + "/arkcompiler/ets_runtime:" +
rebase_path(_root_out_dir_) + "/test/test:" +
rebase_path(_root_out_dir_) + "/${_icu_path_}:" +
rebase_path(_root_out_dir_) + "/thirdparty/cjson:" +
rebase_path(_root_out_dir_) + "/thirdparty/libuv:" +
rebase_path("//prebuilts/clang/ohos/linux-x86_64/llvm/lib/"),
"--timeout-limit",

25
tooling/BUILD.gn
View File

@ -13,6 +13,9 @@
import("//arkcompiler/ets_runtime/js_runtime_config.gni")
is_cross_platform_build =
defined(build_cross_platform_version) && build_cross_platform_version
config("ark_ecma_debugger_config") {
configs = [
"//arkcompiler/ets_runtime:ark_jsruntime_common_config",
@ -58,10 +61,13 @@ source_set("libark_ecma_debugger_set") {
public_configs = [ ":ark_ecma_debugger_config" ]
deps = [
"$ark_root/libpandafile:arkfile_header_deps",
"//third_party/cJSON:cjson_static",
]
deps = [ "$ark_root/libpandafile:arkfile_header_deps" ]
if (is_cross_platform_build) {
deps += [ "//third_party/cJSON:cjson_static" ]
} else {
deps += [ "//third_party/cJSON:cjson" ]
}
if (is_mingw || is_mac) {
if (is_mingw) {
@ -135,10 +141,13 @@ source_set("libark_ecma_debugger_test_set") {
}
}
deps = [
"$ark_root/libpandafile:arkfile_header_deps",
"//third_party/cJSON:cjson_static",
]
deps = [ "$ark_root/libpandafile:arkfile_header_deps" ]
if (is_cross_platform_build) {
deps += [ "//third_party/cJSON:cjson_static" ]
} else {
deps += [ "//third_party/cJSON:cjson" ]
}
}
ohos_shared_library("libark_ecma_debugger_test") {

1
tooling/test/BUILD.gn
View File

@ -199,6 +199,7 @@ host_unittest_action("DebuggerTest") {
deps = [
"//arkcompiler/ets_runtime:libark_jsruntime_test",
"//arkcompiler/toolchain/tooling:libark_ecma_debugger_test",
"//third_party/cJSON:cjson",
sdk_libc_secshared_dep,
]
}