From 63ee0ee81af37b9fa3c905041cc51ec7ed66dbda Mon Sep 17 00:00:00 2001 From: Ilya Erokhin Date: Thu, 24 Jul 2025 16:12:26 +0300 Subject: [PATCH] Fix build configs to build OpenHarmony Signed-off-by: Ilya Erokhin --- arkoala-arkts/BUILD.gn | 5 ++ tools/patches/mirror01.patch | 151 +++-------------------------------- 2 files changed, 17 insertions(+), 139 deletions(-) diff --git a/arkoala-arkts/BUILD.gn b/arkoala-arkts/BUILD.gn index 7cfcd028c..d08b2a9b4 100644 --- a/arkoala-arkts/BUILD.gn +++ b/arkoala-arkts/BUILD.gn @@ -72,6 +72,11 @@ ohos_shared_library("ArkoalaNative_ark") { "$framework_root/generated/callback_managed_caller.cc", ] + deps = [ + # temp usage koala_projects dependency to support OpenHarmony build + "../../koala_projects/arkoala-arkts/arkui-ohos/src/ani/native:arkoala_native_ani", + ] + external_deps = [ "hilog:hilog_ndk", "runtime_core:ani", diff --git a/tools/patches/mirror01.patch b/tools/patches/mirror01.patch index f6899dcc1..675b20234 100644 --- a/tools/patches/mirror01.patch +++ b/tools/patches/mirror01.patch @@ -1,5 +1,5 @@ diff --git a/adapter/ohos/build/BUILD.gn b/adapter/ohos/build/BUILD.gn -index 1ca700aabc7..eb30ab00504 100644 +index 57664f2336e..80749fd1b1b 100644 --- a/adapter/ohos/build/BUILD.gn +++ b/adapter/ohos/build/BUILD.gn @@ -26,8 +26,7 @@ group("ace_packages") { @@ -13,7 +13,7 @@ index 1ca700aabc7..eb30ab00504 100644 "$ace_root/interfaces/inner_api:innerkits_target", "$ace_root/interfaces/inner_api/ace:ace_forward_compatibility", diff --git a/frameworks/bridge/arkts_frontend/BUILD.gn b/frameworks/bridge/arkts_frontend/BUILD.gn -index 2192a770a88..37d8870bbd2 100644 +index bd949a7c027..223bc175e20 100644 --- a/frameworks/bridge/arkts_frontend/BUILD.gn +++ b/frameworks/bridge/arkts_frontend/BUILD.gn @@ -13,34 +13,6 @@ @@ -35,7 +35,7 @@ index 2192a770a88..37d8870bbd2 100644 - "koala_projects/incremental/compat:compat_abc", - "koala_projects/incremental/runtime:runtime_abc", - "koala_projects/interop:interop-arkts_abc", -- "koala_projects/arkoala-arkts:components_abc" +- "koala_projects/arkoala-arkts:components_abc", - ] - - output_name = "arkoala" @@ -51,7 +51,7 @@ index 2192a770a88..37d8870bbd2 100644 template("arkts_frontend") { forward_variables_from(invoker, "*") -@@ -50,15 +22,20 @@ template("arkts_frontend") { +@@ -50,8 +22,14 @@ template("arkts_frontend") { part_name = ace_engine_part defines += invoker.defines configs = [ "$ace_root:ace_config" ] @@ -68,14 +68,7 @@ index 2192a770a88..37d8870bbd2 100644 } sources = [ - "ani_context_module.cpp", - "ani_graphics_module.cpp", - "ani_water_flow_module.cpp", -- "ani_list_module.cpp", - "arkts_ani_utils.cpp", - "arkts_frontend.cpp", - "arkts_plugin_frontend.cpp", -@@ -89,186 +66,3 @@ foreach(item, ace_platforms) { +@@ -90,66 +68,3 @@ foreach(item, ace_platforms) { } } } @@ -113,9 +106,9 @@ index 2192a770a88..37d8870bbd2 100644 - - # interop source - sources += [ +- "koala_projects/interop/src/cpp/ani/convertors-ani.cc", - "koala_projects/interop/src/cpp/callback-resource.cc", - "koala_projects/interop/src/cpp/common-interop.cc", -- "koala_projects/interop/src/cpp/ani/convertors-ani.cc", - "koala_projects/interop/src/cpp/interop-logging.cc", - "koala_projects/interop/src/cpp/types/signatures.cc", - ] @@ -132,133 +125,13 @@ index 2192a770a88..37d8870bbd2 100644 - "runtime_core:ani", - ] - -- subsystem_name = ace_engine_subsystem -- part_name = ace_engine_part --} -- --if (use_linux) { -- loader_include_dirs = [ -- "koala_projects/arkoala/framework/native/src", -- "koala_projects/arkoala/framework/native/src/generated", -- "koala_projects/arkoala/node_modules/node-api-headers/include", -- "koala_projects/interop/src", -- "koala_projects/interop/src/cpp", -- "koala_projects/interop/src/cpp/ets", -- "koala_projects/interop/src/cpp/types", -- "koala_projects/interop/src/cpp/ohos", -- "koala_projects/interop/src/cpp/napi", -- ] -- -- ohos_shared_library("ArkoalaLoader") { -- include_dirs = loader_include_dirs -- -- defines = [ -- "INTEROP_LIBRARY_NAME=ArkoalaNative_linux_x64", -- "KOALA_LINUX", -- "KOALA_NAPI", -- "KOALA_USE_NODE_VM", -- "USE_DUMMY_IMPL", -- "LIBACE_LINUX_X64", -- ] -- -- sources = [ -- "koala_projects/arkoala/framework/native/src/generated/bridge_custom.cc", -- "koala_projects/arkoala/framework/native/src/generated/library.cc", -- "koala_projects/arkoala/framework/native/src/vsync.cc", -- ] -- -- # interop source -- sources += [ -- "koala_projects/interop/src/cpp/common-interop.cc", -- "koala_projects/interop/src/cpp/interop-logging.cc", -- "koala_projects/interop/src/cpp/napi/convertors-napi.cc", -- ] -- -- external_deps = [ -- "hilog:hilog_ndk", -- "napi:ace_napi", -- ] -- -- subsystem_name = ace_engine_subsystem -- part_name = ace_engine_part -- } -- -- ohos_shared_library("vmloader") { -- include_dirs = loader_include_dirs + [ "koala_projects/interop/src/cpp/ani" ] -- -- defines = [ -- "KOALA_LINUX", -- "KOALA_ANI", -- "KOALA_ETS_NAPI", -- ] -- -- sources = [ "koala_projects/interop/src/cpp/vmloader.cc" ] -- -- external_deps = [ -- "hilog:hilog_ndk", -- "napi:ace_napi", -- ] -- -- subsystem_name = ace_engine_subsystem -- part_name = ace_engine_part -- } -- -- native_include_dirs = [ -- "koala_projects/arkoala/framework/native/src", -- "koala_projects/arkoala/framework/native/src/generated", -- "koala_projects/arkoala/node_modules/node-api-headers/include", -- "koala_projects/interop/src/cpp", -- "koala_projects/interop/src/cpp/napi", -- "koala_projects/interop/src/cpp/types", -- ] -- -- native_sources = [ -- "koala_projects/arkoala/framework/native/src/events.cc", -- "koala_projects/arkoala/framework/native/src/generated/bridge_custom.cc", -- "koala_projects/arkoala/framework/native/src/generated/bridge_generated.cc", -- "koala_projects/arkoala/framework/native/src/generated/callback_deserialize_call.cc", -- "koala_projects/arkoala/framework/native/src/generated/callback_managed_caller.cc", -- "koala_projects/arkoala/framework/native/src/generated/library.cc", -- "koala_projects/arkoala/framework/native/src/vsync.cc", -- "koala_projects/interop/src/cpp/callback-resource.cc", -- "koala_projects/interop/src/cpp/common-interop.cc", -- "koala_projects/interop/src/cpp/interop-logging.cc", -- "koala_projects/interop/src/cpp/types/signatures.cc", -- ] -- -- native_defines = [ -- "INTEROP_LIBRARY_NAME=ArkoalaNative_linux_x64", -- "KOALA_LINUX", -- "KOALA_USE_PANDA_VM", -- "KOALA_FOREIGN_NAPI", -- "LIBACE_LINUX_X64", -- ] -- -- ohos_shared_library("ArkoalaNative_ani") { -- include_dirs = native_include_dirs + [ "koala_projects/interop/src/cpp/ani" ] -- defines = native_defines + [ "KOALA_ANI" ] -- sources = native_sources + [ "koala_projects/interop/src/cpp/ani/convertors-ani.cc" ] -- -- external_deps = [ -- "hilog:hilog_ndk", -- "napi:ace_napi", -- ] - -- subsystem_name = ace_engine_subsystem -- part_name = ace_engine_part +- if (is_arkui_x) { +- deps += [ "//third_party/bounds_checking_function:libsec_static" ] +- } else { +- external_deps += [ "bounds_checking_function:libsec_static" ] - } - -- ohos_shared_library("ArkoalaNative_ets") { -- include_dirs = native_include_dirs + [ "koala_projects/interop/src/cpp/ets" ] -- defines = native_defines + [ "KOALA_ETS_NAPI" ] -- sources = native_sources + [ "koala_projects/interop/src/cpp/ets/convertors-ets.cc" ] -- -- external_deps = [ -- "hilog:hilog_ndk", -- "napi:ace_napi", -- ] -- -- subsystem_name = ace_engine_subsystem -- part_name = ace_engine_part -- } +- subsystem_name = ace_engine_subsystem +- part_name = ace_engine_part -} -- Gitee