From 0302b7a20dcacf780f8f850c64dceff688a3be10 Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Thu, 21 Aug 2025 16:13:12 +0300 Subject: [PATCH] Include koala_mirror Signed-off-by: Korobeinikov Evgeny Change-Id: I29cce55ba436f280aea4d59e6b2b861684b9c66d --- adapter/ohos/build/BUILD.gn | 9 +- adapter/preview/sdk/sharedlib_config.gni | 32 ++-- frameworks/bridge/arkts_frontend/BUILD.gn | 202 ++++++++++++---------- 3 files changed, 124 insertions(+), 119 deletions(-) diff --git a/adapter/ohos/build/BUILD.gn b/adapter/ohos/build/BUILD.gn index 3aa97ba508d..eb30ab00504 100644 --- a/adapter/ohos/build/BUILD.gn +++ b/adapter/ohos/build/BUILD.gn @@ -26,8 +26,7 @@ group("ace_packages") { "$ace_root/build:libace_engine_pa_ark", "$ace_root/component_ext:component_ext", "$ace_root/frameworks/base/network:ace_network", - "$ace_root/frameworks/bridge/arkts_frontend:arkoala_abc_prebuild", - "$ace_root/frameworks/bridge/arkts_frontend:arkts_frontend_native_package", + "$ace_root/frameworks/bridge/arkts_frontend/koala_mirror/arkoala-arkts:arkoala", "$ace_root/frameworks/bridge/cj_frontend:cj_frontend_ohos", "$ace_root/interfaces/inner_api:innerkits_target", "$ace_root/interfaces/inner_api/ace:ace_forward_compatibility", @@ -36,12 +35,6 @@ group("ace_packages") { "$ace_root/interfaces/native:ace_packages_ndk", ] - if (use_linux) { - deps += [ "$ace_root/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native:arkoala_native_ani_linux" ] - } else { - deps += [ "$ace_root/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native:arkoala_native_ani" ] - } - if (is_asan) { deps -= [ "$ace_root/build:libace" ] } diff --git a/adapter/preview/sdk/sharedlib_config.gni b/adapter/preview/sdk/sharedlib_config.gni index 6904ba7d2ad..5d2278e7b20 100644 --- a/adapter/preview/sdk/sharedlib_config.gni +++ b/adapter/preview/sdk/sharedlib_config.gni @@ -339,22 +339,22 @@ napi_modules = [ ] }, ] - if (use_linux) { - shard_libs += [ - { - label = "//foundation/arkui/ace_engine/frameworks/bridge/arkts_frontend:ArkoalaNative_ark" - subsystem_name = "arkui" - part_name = "ace_engine" - lib_names = [ "ArkoalaNative_ark" ] - }, - { - label = "//foundation/arkui/ace_engine/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native:arkoala_native_ani_linux" - subsystem_name = "arkui" - part_name = "ace_engine" - lib_names = [ "arkoala_native_ani" ] - }, - ] - } + # if (use_linux) { + # shard_libs += [ + # { + # label = "//foundation/arkui/ace_engine/frameworks/bridge/arkts_frontend:ArkoalaNative_ark" + # subsystem_name = "arkui" + # part_name = "ace_engine" + # lib_names = [ "ArkoalaNative_ark" ] + # }, + # { + # label = "//foundation/arkui/ace_engine/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/ani/native:arkoala_native_ani_linux" + # subsystem_name = "arkui" + # part_name = "ace_engine" + # lib_names = [ "arkoala_native_ani" ] + # }, + # ] + # } }, { prefix = "util" diff --git a/frameworks/bridge/arkts_frontend/BUILD.gn b/frameworks/bridge/arkts_frontend/BUILD.gn index 598da5175dc..007f19028a9 100644 --- a/frameworks/bridge/arkts_frontend/BUILD.gn +++ b/frameworks/bridge/arkts_frontend/BUILD.gn @@ -13,37 +13,37 @@ import("//build/ohos.gni") import("//foundation/arkui/ace_engine/ace_config.gni") -import("./link_abc.gni") - -group("arkts_frontend_native_package") { - deps = [ - ":arkts_frontend", - "koala_projects/arkoala-arkts/arkui-ohos/src/ani/native:ace_ani_native_package" - ] -} -group("arkoala_ui2abc") { - deps = [ "koala_projects/arkoala-arkts:arkoala" ] -} - -link_abc_files("arkoala_abc") { - targets = [ - "koala_projects/incremental/common:common_abc", - "koala_projects/incremental/compat:compat_abc", - "koala_projects/incremental/runtime:runtime_abc", - "koala_projects/interop:interop-arkts_abc", - "koala_projects/arkoala-arkts:components_abc", - ] - - output_name = "arkoala" -} - -ohos_prebuilt_etc("arkoala_abc_prebuild") { - source = "$target_out_dir/arkoala.abc" - deps = [ ":arkoala_abc" ] - module_install_dir = "framework" - subsystem_name = ace_engine_subsystem - part_name = ace_engine_part -} +# import("./link_abc.gni") + +# group("arkts_frontend_native_package") { +# deps = [ +# ":arkts_frontend", +# "koala_projects/arkoala-arkts/arkui-ohos/src/ani/native:ace_ani_native_package" +# ] +# } +# group("arkoala_ui2abc") { +# deps = [ "koala_projects/arkoala-arkts:arkoala" ] +# } + +# link_abc_files("arkoala_abc") { +# targets = [ +# "koala_projects/incremental/common:common_abc", +# "koala_projects/incremental/compat:compat_abc", +# "koala_projects/incremental/runtime:runtime_abc", +# "koala_projects/interop:interop-arkts_abc", +# "koala_projects/arkoala-arkts:components_abc", +# ] + +# output_name = "arkoala" +# } + +# ohos_prebuilt_etc("arkoala_abc_prebuild") { +# source = "$target_out_dir/arkoala.abc" +# deps = [ ":arkoala_abc" ] +# module_install_dir = "framework" +# subsystem_name = ace_engine_subsystem +# part_name = ace_engine_part +# } template("arkts_frontend") { forward_variables_from(invoker, "*") @@ -51,10 +51,17 @@ template("arkts_frontend") { ohos_shared_library("arkts_frontend") { defines += invoker.defines configs = [ "$ace_root:ace_config" ] - deps = [ - ":ArkoalaNative_ark", - "$ace_root/build:libace_compatible" - ] + if (build_ohos_sdk) { + deps = [ + "koala_mirror/ui2abc:ui2abc", + ] + } else { + deps = [ + "koala_mirror/arkoala-arkts:arkoala" + ] + } + deps += [ "$ace_root/build:libace_compatible" ] + sources = [ "ani_context_module.cpp", @@ -84,6 +91,11 @@ template("arkts_frontend_loader") { sources = [ "arkts_frontend_loader.cpp", ] + + deps = [ + "//foundation/arkui/ace_engine/frameworks/core/components/theme:build_theme_code" + ] + } } @@ -119,63 +131,63 @@ foreach(item, ace_platforms) { } } -config("arkoala_native_config") { - include_dirs = [ - "koala_projects/arkoala/framework/native/src", - "koala_projects/arkoala/framework/native/src/generated", - "koala_projects/interop/src", - "koala_projects/interop/src/cpp", - "koala_projects/interop/src/cpp/ani", - "koala_projects/interop/src/cpp/ets", - "koala_projects/interop/src/cpp/types", - "koala_projects/interop/src/cpp/ohos", - "$ace_root/interfaces/inner_api/ace_kit/include" - ] -} - -ohos_shared_library("ArkoalaNative_ark") { - defines = [ - "KOALA_OHOS", - "__MUSL__", - "KOALA_ANI", - "KOALA_USE_PANDA_VM", - ] - - sources = [ - "koala_projects/arkoala/framework/native/src/resource_color_helper.cc", - "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", - ] - - # 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/interop-logging.cc", - "koala_projects/interop/src/cpp/types/signatures.cc", - ] - - configs = [ ":arkoala_native_config" ] - - external_deps = [ - "hilog:hilog_ndk", - "hilog:libhilog", - "runtime_core:ani", - ] - - - if (is_arkui_x) { - deps += [ "//third_party/bounds_checking_function:libsec_static" ] - } else { - external_deps += [ "bounds_checking_function:libsec_static" ] - } - - subsystem_name = ace_engine_subsystem - part_name = ace_engine_part -} +# config("arkoala_native_config") { +# include_dirs = [ +# "koala_projects/arkoala/framework/native/src", +# "koala_projects/arkoala/framework/native/src/generated", +# "koala_projects/interop/src", +# "koala_projects/interop/src/cpp", +# "koala_projects/interop/src/cpp/ani", +# "koala_projects/interop/src/cpp/ets", +# "koala_projects/interop/src/cpp/types", +# "koala_projects/interop/src/cpp/ohos", +# "$ace_root/interfaces/inner_api/ace_kit/include" +# ] +# } + +# ohos_shared_library("ArkoalaNative_ark") { +# defines = [ +# "KOALA_OHOS", +# "__MUSL__", +# "KOALA_ANI", +# "KOALA_USE_PANDA_VM", +# ] + +# sources = [ +# "koala_projects/arkoala/framework/native/src/resource_color_helper.cc", +# "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", +# ] + +# # 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/interop-logging.cc", +# "koala_projects/interop/src/cpp/types/signatures.cc", +# ] + +# configs = [ ":arkoala_native_config" ] + +# external_deps = [ +# "hilog:hilog_ndk", +# "hilog:libhilog", +# "runtime_core:ani", +# ] + + +# if (is_arkui_x) { +# deps += [ "//third_party/bounds_checking_function:libsec_static" ] +# } else { +# external_deps += [ "bounds_checking_function:libsec_static" ] +# } + +# subsystem_name = ace_engine_subsystem +# part_name = ace_engine_part +# } -- Gitee