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

put lib_ark_builtins.d.abc into images of arm64

Browse Source 
Issue:https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I796CS?from=project-issue
Signed-off-by: zhangyukun <zhangyukun8@huawei.com>

Change-Id: Ia07e1291069a19f16ce4aa46a43904f63d92f052
This commit is contained in:
zhangyukun 2023-05-29 16:50:41 +08:00
parent ed9adb5e20
commit 0f3023afd5
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -901,7 +901,7 @@ if (is_mingw) {
ohos_source_set("libark_jsruntime_set") {
stack_protector_ret = false
if (is_ohos && is_standard_system) {
stub_an_file_path = "/system/lib64/module/stub.an"
stub_an_file_path = "/system/lib64/${arkcompiler_relative_lib_path}/stub.an"
} else {
stub_an_file_path =
rebase_path("$root_gen_dir/arkcompiler/ets_runtime/stub.an")
@ -969,7 +969,7 @@ ohos_source_set("libark_jsruntime_test_set") {
defines = [ "OHOS_UNIT_TEST" ]
if (is_ohos && is_standard_system) {
stub_an_file_path = "/system/lib64/module/stub.an"
stub_an_file_path = "/system/lib64/${arkcompiler_relative_lib_path}/stub.an"
} else {
stub_an_file_path =
rebase_path("$root_gen_dir/arkcompiler/ets_runtime/stub.an")

24
ecmascript/compiler/BUILD.gn
View File

@ -377,6 +377,7 @@ ohos_executable("ark_aot_compiler") {
]
deps = [
":lib_ark_builtins.d.abc",
":libark_mock_stub_set",
"$ark_root/libpandabase:libarkbase_static",
"$ark_root/libpandafile:arkfile_header_deps",
@ -398,6 +399,10 @@ ohos_executable("ark_aot_compiler") {
]
}
target_builtins_dts_path =
"/system/lib64/${arkcompiler_relative_lib_path}/lib_ark_builtins.d.abc"
defines = [ "TARGET_BUILTINS_DTS_PATH=\"${target_builtins_dts_path}\"" ]
# hiviewdfx libraries
external_deps = hiviewdfx_ext_deps
deps += hiviewdfx_deps
@ -451,7 +456,7 @@ ohos_prebuilt_shared_library("stub.an") {
deps = [ ":gen_stub_file" ]
source = "$root_gen_dir/arkcompiler/ets_runtime/stub.an"
relative_install_dir = "module"
relative_install_dir = arkcompiler_relative_lib_path
part_name = "ets_runtime"
subsystem_name = "arkcompiler"
}
@ -472,3 +477,20 @@ action("build_stub_to_cpp") {
outputs = [ "$root_gen_dir/arkcompiler/ets_runtime/stub_an.cpp" ]
}
ohos_copy("lib_ark_builtins.d.abc") {
deps = [ "$js_root:es2abc_gen_builtins_d_abc" ]
sources = [ rebase_path(root_out_dir) + "/obj/arkcompiler/ets_runtime/lib_ark_builtins/es2abc/lib_ark_builtins.d.abc" ]
# Set the output directory
outputs = [ "$target_out_dir/lib_ark_builtins.d.abc" ]
# Set the install directory
install_enable = true
module_type = "lib"
relative_install_dir = arkcompiler_relative_lib_path
# Set the subsystem name
part_name = "ets_runtime"
subsystem_name = "arkcompiler"
}

3
ecmascript/compiler/aot_compiler.cpp
View File

@ -140,6 +140,9 @@ int Main(const int argc, const char **argv)
if (runtimeOptions.IsTargetCompilerMode()) {
runtimeOptions.SetTargetTriple("aarch64-unknown-linux-gnu");
runtimeOptions.WasSet(CommandValues::OPTION_BUILTINS_DTS);
std::string builtinsDtsPath = TARGET_BUILTINS_DTS_PATH;
runtimeOptions.SetBuiltinsDTS(builtinsDtsPath);
if (runtimeOptions.IsPartialCompilerMode()) {
runtimeOptions.SetEnableOptPGOType(true);
if (runtimeOptions.IsPGOProfilerPathEmpty()) {

3
js_runtime_config.gni
View File

@ -44,6 +44,9 @@ enable_coverage = false
enable_asm_assert = false
ark_compile_mode = "debug"
asan_lib_path = "/usr/lib/llvm-10/lib/clang/10.0.0/lib/linux"
# under /system/lib64 dir
arkcompiler_relative_lib_path = "module/arkcompiler"
if (is_standard_system || ark_standalone_build) {
icu_part_name = "icu"
icu_subsystem_name = "thirdparty"