From ad55a2e09768b05269a21099bb66fe455ca6eab7 Mon Sep 17 00:00:00 2001 From: Alexey Khoraskin Date: Tue, 2 Sep 2025 11:54:31 +0300 Subject: [PATCH] Support Standalone Previewer. Signed-off-by: Alexey Khoraskin Change-Id: Ia898fa1005f28828f61f6897d262bdf10c12f4bb --- frameworks/simulator/BUILD.gn | 4 +++- frameworks/simulator/ability_simulator/BUILD.gn | 9 ++++++--- .../include/bundle_parser/inner_bundle_info.h | 3 +++ .../src/bundle_parser/module_profile.cpp | 1 + .../ability_simulator/src/resource_manager_helper.cpp | 2 +- frameworks/simulator/ability_simulator/src/simulator.cpp | 2 ++ frameworks/simulator/build/ability_simulator.gni | 4 ++-- js_environment/interfaces/inner_api/source_map.h | 2 ++ 8 files changed, 20 insertions(+), 7 deletions(-) diff --git a/frameworks/simulator/BUILD.gn b/frameworks/simulator/BUILD.gn index fe4510fae1e..ef4dc70c41b 100644 --- a/frameworks/simulator/BUILD.gn +++ b/frameworks/simulator/BUILD.gn @@ -16,8 +16,10 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") if (is_mac) { dylib_suffix = ".dylib" -} else { +} else if (is_mingw) { dylib_suffix = ".dll" +} else if (is_linux) { + dylib_suffix = ".so" } not_needed("*", [ "dylib_suffix" ]) diff --git a/frameworks/simulator/ability_simulator/BUILD.gn b/frameworks/simulator/ability_simulator/BUILD.gn index c0f0a38a505..a9392904ff2 100644 --- a/frameworks/simulator/ability_simulator/BUILD.gn +++ b/frameworks/simulator/ability_simulator/BUILD.gn @@ -21,7 +21,7 @@ config("ability_simulator_public_config") { } ohos_shared_library("ability_simulator_inner") { - if (is_mingw || is_mac) { + if (is_mingw || is_mac || is_linux) { defines = [] if (is_mingw) { defines += [ @@ -52,6 +52,7 @@ ohos_shared_library("ability_simulator_inner") { "${windowmanager_path}/interfaces/kits/napi/window_runtime/window_stage_napi", "include/bundle_parser", "${simulator_path}/napi_module/application", + "${resource_management_path}/interfaces/inner_api/include", ] sources = [ @@ -121,8 +122,10 @@ ohos_shared_library("ability_simulator_inner") { if (is_mingw) { external_deps += [ "resource_management:win_resmgr" ] - } else { + } else if (is_mac) { external_deps += [ "resource_management:mac_resmgr" ] + } else if (is_linux) { + external_deps += [ "resource_management:linux_resmgr" ] } } @@ -133,7 +136,7 @@ ohos_shared_library("ability_simulator_inner") { } group("ability_simulator") { - if (is_mingw || is_mac) { + if (is_mingw || is_mac || is_linux) { public_deps = [ ":ability_simulator_inner" ] } } diff --git a/frameworks/simulator/ability_simulator/include/bundle_parser/inner_bundle_info.h b/frameworks/simulator/ability_simulator/include/bundle_parser/inner_bundle_info.h index ad504017f3b..923af728907 100644 --- a/frameworks/simulator/ability_simulator/include/bundle_parser/inner_bundle_info.h +++ b/frameworks/simulator/ability_simulator/include/bundle_parser/inner_bundle_info.h @@ -16,6 +16,9 @@ #ifndef OHOS_ABILITY_RUNTIME_SIMULATOR_INNER_BUNDLE_INFO_H #define OHOS_ABILITY_RUNTIME_SIMULATOR_INNER_BUNDLE_INFO_H +#include +#include + #include "ability_info.h" #include "bundle_constants.h" #include "bundle_info.h" diff --git a/frameworks/simulator/ability_simulator/src/bundle_parser/module_profile.cpp b/frameworks/simulator/ability_simulator/src/bundle_parser/module_profile.cpp index 4b1134b17f9..065076b4632 100644 --- a/frameworks/simulator/ability_simulator/src/bundle_parser/module_profile.cpp +++ b/frameworks/simulator/ability_simulator/src/bundle_parser/module_profile.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "bundle_constants.h" #include "bundle_info.h" diff --git a/frameworks/simulator/ability_simulator/src/resource_manager_helper.cpp b/frameworks/simulator/ability_simulator/src/resource_manager_helper.cpp index be3e8893313..81771c841e9 100644 --- a/frameworks/simulator/ability_simulator/src/resource_manager_helper.cpp +++ b/frameworks/simulator/ability_simulator/src/resource_manager_helper.cpp @@ -25,7 +25,7 @@ const std::string RESOURCES_FILE_NAME = "resources.index"; #if defined(WINDOWS_PLATFORM) constexpr char DELIMITER[] = "\\"; -#elif defined(MAC_PLATFORM) +#elif defined(MAC_PLATFORM) || defined(LINUX_PLATFORM) constexpr char DELIMITER[] = "/"; #else #error "Unsupported platform" diff --git a/frameworks/simulator/ability_simulator/src/simulator.cpp b/frameworks/simulator/ability_simulator/src/simulator.cpp index b51897b2530..60cd05bf0a0 100644 --- a/frameworks/simulator/ability_simulator/src/simulator.cpp +++ b/frameworks/simulator/ability_simulator/src/simulator.cpp @@ -72,6 +72,8 @@ const std::string DEPENDENCY_ALIAS = "dependencyAlias"; constexpr char ARK_DEBUGGER_LIB_PATH[] = "libark_inspector.dll"; #elif defined(MAC_PLATFORM) constexpr char ARK_DEBUGGER_LIB_PATH[] = "libark_inspector.dylib"; +#elif defined(LINUX_PLATFORM) +constexpr char ARK_DEBUGGER_LIB_PATH[] = "libark_inspector.so"; #else #error "Unsupported platform" #endif diff --git a/frameworks/simulator/build/ability_simulator.gni b/frameworks/simulator/build/ability_simulator.gni index e7f52af6398..1225e393d92 100644 --- a/frameworks/simulator/build/ability_simulator.gni +++ b/frameworks/simulator/build/ability_simulator.gni @@ -29,7 +29,7 @@ template("gen_js_src_binary") { gen_obj(target_name + "_js") { input = invoker.js_source - if (is_mac || is_mingw) { + if (is_mac || is_mingw || is_linux) { output = target_out_dir + "/" + invoker.target_name + "_js.c" } else { output = target_out_dir + "/" + invoker.target_name + "_js.o" @@ -43,7 +43,7 @@ template("gen_js_src_binary") { get_label_info(":gen_abc_" + invoker.target_name, "target_out_dir") + "/" + get_path_info(invoker.js_source, "name") + ".abc" - if (is_mac || is_mingw) { + if (is_mac || is_mingw || is_linux) { output = target_out_dir + "/" + invoker.target_name + "_abc.c" } else { output = target_out_dir + "/" + invoker.target_name + "_abc.o" diff --git a/js_environment/interfaces/inner_api/source_map.h b/js_environment/interfaces/inner_api/source_map.h index 90cd345e2c0..b10cab588d8 100644 --- a/js_environment/interfaces/inner_api/source_map.h +++ b/js_environment/interfaces/inner_api/source_map.h @@ -18,7 +18,9 @@ #include #include +#include #include +#include #include #include #include -- Gitee