diff --git a/ecmascript/compiler/BUILD.gn b/ecmascript/compiler/BUILD.gn index 12120aedc4d0ae68fed59b5a480e82371daef437..a7c2d6c43d490ce166517529e15098e6d654e1fc 100644 --- a/ecmascript/compiler/BUILD.gn +++ b/ecmascript/compiler/BUILD.gn @@ -181,11 +181,11 @@ ark_gen_file("stub_aot_options_gen_h") { output_file = "$target_gen_dir/generated/stub_aot_options_gen.h" } -ohos_executable("ark_stub_opt") { +source_set("ark_stub_opt_static"){ sources = [ "stub_aot_compiler.cpp" ] include_dirs = [ "$target_gen_dir" ] - configs = [ + public_configs = [ ":include_llvm", ":ark_jsruntime_compiler_config", "//ark/js_runtime:ark_jsruntime_public_config", @@ -202,6 +202,10 @@ ohos_executable("ark_stub_opt") { if (!is_standard_system) { deps += [ "$ark_root/runtime:libarkruntime" ] } +} + +ohos_executable("ark_stub_opt") { + deps = [ ":ark_stub_opt_static" ] part_name = "ark_js_runtime" install_enable = false diff --git a/ecmascript/js_vm/BUILD.gn b/ecmascript/js_vm/BUILD.gn index 0f9aaa5172bd56259eea39128f8099bb087e5895..7b607a750dae19d26f94619b820e7c7f788ffca9 100644 --- a/ecmascript/js_vm/BUILD.gn +++ b/ecmascript/js_vm/BUILD.gn @@ -14,10 +14,10 @@ import("//ark/js_runtime/js_runtime_config.gni") import("//build/ohos.gni") -ohos_executable("ark_js_vm") { +source_set("ark_js_vm_static"){ sources = [ "main.cpp" ] - configs = [ + public_configs = [ "//ark/js_runtime:ark_jsruntime_config", "//ark/js_runtime:ark_jsruntime_public_config", "$ark_root/runtime:arkruntime_public_config", @@ -31,6 +31,10 @@ ohos_executable("ark_js_vm") { if (!is_standard_system) { deps += [ "$ark_root/runtime:libarkruntime" ] } +} + +ohos_executable("ark_js_vm") { + deps = [ ":ark_js_vm_static" ] part_name = "ark_js_runtime" install_enable = false diff --git a/ecmascript/tooling/test/BUILD.gn b/ecmascript/tooling/test/BUILD.gn index b7c59d6f388a03371bd5f085afa3d1efba6a31a7..9b40332624b4cc82ab14f2fe94e1c5d99b85cb9d 100644 --- a/ecmascript/tooling/test/BUILD.gn +++ b/ecmascript/tooling/test/BUILD.gn @@ -43,7 +43,7 @@ ts2abc_gen_abc("ark_debug_abc") { out_puts = [ test_abc_path ] } -ohos_shared_library("jsdebugtest") { +source_set("jsdebugtest_static"){ sources = [ "init.cpp", "test_extractor.cpp", @@ -51,7 +51,7 @@ ohos_shared_library("jsdebugtest") { "test_util.cpp", ] - configs = [ + public_configs = [ "//ark/js_runtime:ark_jsruntime_public_config", # should add before # arkruntime_public_config "//ark/js_runtime:ark_jsruntime_common_config", @@ -71,6 +71,10 @@ ohos_shared_library("jsdebugtest") { } else { deps += [ "$ark_root/runtime:libarkruntime" ] } +} + +ohos_shared_library("jsdebugtest") { + deps = [ ":jsdebugtest_static" ] output_extension = "so" subsystem_name = "test"