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

Fix arkui-x compilation

Browse Source 
Issue: IAICVS
Tests: build target & UT & standalone build

Signed-off-by: chenlong <chenlong292@h-partners.com>
Change-Id: I2b8c820c591e247b8b458549faf68659bec15eba
This commit is contained in:
cllvly 2024-07-23 15:10:34 +08:00
parent 94a3aee0d3
commit 446e6cf9eb
3 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libpandabase/BUILD.gn
View File

@ -201,10 +201,12 @@ ohos_static_library("libarkbase_static") {
deps = libarkbase_deps
if (!ark_standalone_build) {
public_external_deps = [ sdk_libc_secshared_dep ]
} else {
if (is_arkui_x) {
deps += [ "$ark_third_party_root/bounds_checking_function:libsec_static" ]
} else if (ark_standalone_build) {
external_deps = [ sdk_libc_secshared_dep ]
} else {
public_external_deps = [ sdk_libc_secshared_dep ]
}
if (enable_hilog) {
@ -235,7 +237,11 @@ ohos_source_set("libarkbase_frontend_set_static") {
deps = libarkbase_deps
external_deps = [ sdk_libc_secshared_dep ]
if (is_arkui_x) {
deps += [ "$ark_third_party_root/bounds_checking_function:libsec_static" ]
} else {
external_deps = [ sdk_libc_secshared_dep ]
}
part_name = "runtime_core"
subsystem_name = "arkcompiler"

33
libpandafile/BUILD.gn
View File

@ -106,14 +106,19 @@ ohos_static_library("libarkfile_static") {
"$ark_root/libziparchive:libarkziparchive_static",
]
if (!ark_standalone_build) {
public_external_deps = [
"zlib:libz",
if (is_arkui_x) {
deps += [
"$ark_third_party_root/bounds_checking_function:libsec_static",
"$ark_third_party_root/zlib:libz",
]
} else if (ark_standalone_build) {
external_deps = [
"zlib:shared_libz",
sdk_libc_secshared_dep,
]
} else {
external_deps = [
"zlib:libz",
public_external_deps = [
"zlib:shared_libz",
sdk_libc_secshared_dep,
]
}
@ -205,11 +210,21 @@ ohos_source_set("libarkfile_frontend_set_static") {
"$ark_root/libziparchive:libarkziparchive_frontend_static",
]
external_deps = [ sdk_libc_secshared_dep ]
if (!ark_standalone_build) {
public_external_deps = [ "zlib:libz" ]
if (is_arkui_x) {
deps += [
"$ark_third_party_root/bounds_checking_function:libsec_static",
"$ark_third_party_root/zlib:libz",
]
} else if (ark_standalone_build) {
external_deps = [
"zlib:libz",
sdk_libc_secshared_dep,
]
} else {
external_deps += [ "zlib:libz" ]
public_external_deps = [
"zlib:libz",
sdk_libc_secshared_dep,
]
}
part_name = "runtime_core"

34
libziparchive/BUILD.gn
View File

@ -31,12 +31,21 @@ ohos_source_set("libarkziparchive_static") {
deps = [ "$ark_root/libpandabase:libarkbase_static" ]
external_deps = [ sdk_libc_secshared_dep ]
if (ark_standalone_build || is_arkui_x) {
external_deps += [ "zlib:libz" ]
if (is_arkui_x) {
deps += [
"$ark_third_party_root/bounds_checking_function:libsec_static",
"$ark_third_party_root/zlib:libz",
]
} else if (ark_standalone_build) {
external_deps = [
"zlib:shared_libz",
sdk_libc_secshared_dep,
]
} else {
public_external_deps = [ "zlib:shared_libz" ]
public_external_deps = [
"zlib:shared_libz",
sdk_libc_secshared_dep,
]
}
if (enable_hilog) {
@ -73,10 +82,17 @@ ohos_source_set("libarkziparchive_frontend_set_static") {
deps = [ "$ark_root/libpandabase:libarkbase_frontend_static" ]
external_deps = [
"zlib:libz",
sdk_libc_secshared_dep,
]
if (is_arkui_x) {
deps += [
"$ark_third_party_root/bounds_checking_function:libsec_static",
"$ark_third_party_root/zlib:libz",
]
} else {
external_deps = [
"zlib:libz",
sdk_libc_secshared_dep,
]
}
part_name = "runtime_core"
subsystem_name = "arkcompiler"