openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 18:20:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!3774 Fix compilation issue on ArkUI-X when compile for Android on MacOS

Browse Source 
Merge pull request !3774 from Pan Zhenyu/previewer
This commit is contained in:
openharmony_ci 2023-03-22 01:52:54 +00:00 committed by Gitee
commit 0b28187629
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -310,7 +310,7 @@ config("ark_jsruntime_common_config") {
"PANDA_TARGET_MACOS",
]
if (enable_hilog && !ark_standalone_build) {
if (enable_hilog && !is_cross_platform_build && !ark_standalone_build) {
defines += [ "ENABLE_HILOG" ]
include_dirs = [ "$hilog_root/include" ]
}
@ -968,7 +968,7 @@ ohos_shared_library("libark_jsruntime") {
if (is_mingw && !ark_standalone_build) {
deps += [ "$hilog_root:libhilog_windows" ]
}
if (is_mac && target_os != "ios" && !ark_standalone_build) {
if (is_mac && !is_cross_platform_build && !ark_standalone_build) {
deps += [ "$hilog_root:libhilog_mac" ]
}
if (target_os == "ios" || ark_standalone_build) {

2
ecmascript/compiler/BUILD.gn
View File

@ -372,7 +372,7 @@ ohos_executable("ark_aot_compiler") {
if (is_mingw && !ark_standalone_build) {
deps += [ "$hilog_root:libhilog_windows" ]
}
if (is_mac && target_os != "ios" && !ark_standalone_build) {
if (is_mac && !is_cross_platform_build && !ark_standalone_build) {
deps += [ "$hilog_root:libhilog_mac" ]
}