diff --git a/assembler/BUILD.gn b/assembler/BUILD.gn index d9e3073566aeabf8fdde2a7b09c8437a9f51a683..ee92e86d6e929aa6dedc75c37041858d841d5d8c 100644 --- a/assembler/BUILD.gn +++ b/assembler/BUILD.gn @@ -47,10 +47,10 @@ libarkassembler_configs = [ "$ark_root/libpandafile:arkfile_public_config", ] -ohos_shared_library("libarkassembler") { +source_set("libarkassembler_static") { sources = libarkassembler_sources - configs = libarkassembler_configs + public_configs = libarkassembler_configs deps = [ ":ark_asm_ecmascript_meta_gen_h", @@ -65,6 +65,10 @@ ohos_shared_library("libarkassembler") { "$ark_root/libpandafile:libarkfile", sdk_libc_secshared_dep, ] +} + +ohos_shared_library("libarkassembler") { + deps = [ ":libarkassembler_static" ] if (!is_standard_system) { relative_install_dir = "ark" } @@ -73,10 +77,10 @@ ohos_shared_library("libarkassembler") { part_name = "ark" } -ohos_static_library("libarkassembler_frontend_static") { +source_set("libarkassembler_frontend_set_static") { sources = libarkassembler_sources - configs = libarkassembler_configs + public_configs = libarkassembler_configs deps = [ ":ark_asm_ecmascript_meta_gen_h", @@ -91,17 +95,21 @@ ohos_static_library("libarkassembler_frontend_static") { "$ark_root/libpandafile:libarkfile_frontend_static", sdk_libc_secshared_dep, ] +} + +ohos_static_library("libarkassembler_frontend_static") { + deps = [ ":libarkassembler_frontend_set_static" ] subsystem_name = "ark" part_name = "ark" } -ohos_executable("ark_asm") { +source_set("ark_asm_static") { sources = [ "pandasm.cpp" ] include_dirs = [ "$target_gen_dir" ] - configs = [ + public_configs = [ sdk_libc_secshared_config, ":arkassembler_public_config", "$ark_root:ark_config", @@ -119,6 +127,10 @@ ohos_executable("ark_asm") { if (!is_mac && !is_mingw && !ark_standalone_build) { ldflags = [ "-static-libstdc++" ] } +} + +ohos_executable("ark_asm") { + deps = [ ":ark_asm_static" ] install_enable = true subsystem_name = "ark" diff --git a/disassembler/BUILD.gn b/disassembler/BUILD.gn index d5f47e81ca79cef37cfaf1356929d28b47789135..d0e0a75bb01db37ffa1efa9dd3efddaab3b90897 100644 --- a/disassembler/BUILD.gn +++ b/disassembler/BUILD.gn @@ -35,12 +35,12 @@ arkdisassembler_configs = [ "$ark_root/libpandafile:arkfile_public_config", ] -ohos_shared_library("arkdisassembler") { +source_set("arkdisassembler_static") { sources = arkdisassembler_sources include_dirs = [ "$ark_root/disassembler" ] - configs = arkdisassembler_configs + public_configs = arkdisassembler_configs deps = [ ":isa_gen_ark_disam_bc_ins_to_pandasm_ins_cpp", @@ -52,6 +52,10 @@ ohos_shared_library("arkdisassembler") { "$ark_root/libpandafile:libarkfile", sdk_libc_secshared_dep, ] +} + +ohos_shared_library("arkdisassembler") { + deps = [ ":arkdisassembler_static" ] if (!is_standard_system) { relative_install_dir = "ark" } @@ -60,12 +64,12 @@ ohos_shared_library("arkdisassembler") { part_name = "ark" } -ohos_static_library("arkdisassembler_frontend_static") { +source_set("arkdisassembler_frontend_set_static") { sources = arkdisassembler_sources include_dirs = [ "$ark_root/disassembler" ] - configs = arkdisassembler_configs + public_configs = arkdisassembler_configs deps = [ ":isa_gen_ark_disam_bc_ins_to_pandasm_ins_cpp", @@ -77,17 +81,21 @@ ohos_static_library("arkdisassembler_frontend_static") { "$ark_root/libpandafile:libarkfile_frontend_static", sdk_libc_secshared_dep, ] +} + +ohos_static_library("arkdisassembler_frontend_static") { + deps = [ ":arkdisassembler_frontend_set_static" ] subsystem_name = "ark" part_name = "ark" } -ohos_executable("ark_disasm") { +source_set("ark_disasm_static") { sources = [ "disasm.cpp" ] include_dirs = [ "$target_gen_dir" ] - configs = [ + public_configs = [ sdk_libc_secshared_config, "$ark_root:ark_config", "$ark_root/assembler:arkassembler_public_config", @@ -105,6 +113,10 @@ ohos_executable("ark_disasm") { if (!is_mac && !is_mingw && !ark_standalone_build) { ldflags = [ "-static-libstdc++" ] } +} + +ohos_executable("ark_disasm") { + deps = [ ":ark_disasm_static" ] install_enable = true subsystem_name = "ark" diff --git a/dprof/BUILD.gn b/dprof/BUILD.gn index eadf956e4432934da9c63609cbabac0c649d3930..41d8695f92fd36ee02ed5d4ceda90ea97c8bc68a 100644 --- a/dprof/BUILD.gn +++ b/dprof/BUILD.gn @@ -22,14 +22,14 @@ config("libdprof_config") { ] } -ohos_static_library("libdprof") { +source_set("libdprof_static") { sources = [ "libdprof/dprof/ipc/ipc_message.cpp", "libdprof/dprof/ipc/ipc_unix_socket.cpp", "libdprof/dprof/profiling_data.cpp", ] - configs = [ + public_configs = [ "$ark_root:ark_config", "$ark_root/libpandabase:arkbase_public_config", sdk_libc_secshared_config, @@ -37,6 +37,10 @@ ohos_static_library("libdprof") { ] deps = [ "$ark_root/libpandabase:libarkbase" ] +} + +ohos_static_library("libdprof") { + deps = [ ":libdprof_static" ] subsystem_name = "ark" part_name = "ark" diff --git a/gn/ark-third-party/miniz/BUILD.gn b/gn/ark-third-party/miniz/BUILD.gn index 07df50dcb405111072114099c87d3bc65a727520..7c6a9c1e30bee440681f8f905ec139330d4d729b 100644 --- a/gn/ark-third-party/miniz/BUILD.gn +++ b/gn/ark-third-party/miniz/BUILD.gn @@ -19,13 +19,16 @@ config("miniz_config") { cflags_c = [ "-Wno-unused-parameter" ] } -ohos_static_library("libminiz") { +source_set("libminiz_static") { sources = [ "miniz.c" ] - configs = [ + public_configs = [ ":miniz_config", "$ark_root:ark_config", ] +} +ohos_static_library("libminiz") { + deps = [ ":libminiz_static" ] subsystem_name = "ark" } diff --git a/gn/ark-third-party/securec/BUILD.gn b/gn/ark-third-party/securec/BUILD.gn index 545d317ba596f5c62ee185d347059584ef9af73f..a24896a61687de22c7799a00c286152aaf09ca52 100644 --- a/gn/ark-third-party/securec/BUILD.gn +++ b/gn/ark-third-party/securec/BUILD.gn @@ -60,7 +60,7 @@ libsec_sources = [ "$ark_third_party_root/securec/src/wscanf_s.c", ] -ohos_static_library("libc_secstatic") { +source_set("libc_secstatic_static") { sources = libsec_sources public_configs = [ ":libsec_public_config" ] cflags = [ @@ -74,7 +74,11 @@ ohos_static_library("libc_secstatic") { ] } -ohos_shared_library("libc_secshared") { +ohos_static_library("libc_secstatic") { + deps = [ ":libc_secstatic_static" ] +} + +source_set("libc_secshared_static") { sources = libsec_sources public_configs = [ ":libsec_public_config" ] cflags = [ @@ -86,6 +90,9 @@ ohos_shared_library("libc_secshared") { "-D_INC_STDLIB_S", "-D_INC_MEMORY_S", ] +} +ohos_shared_library("libc_secshared") { + deps = [ ":libc_secshared_static" ] output_extension = "so" } diff --git a/libpandabase/BUILD.gn b/libpandabase/BUILD.gn index f8883664b9ac58d8bd59c35f7353ea236ec4b1b0..2f0fab89aa81549988889f004ac3224a06fbd4e5 100644 --- a/libpandabase/BUILD.gn +++ b/libpandabase/BUILD.gn @@ -122,13 +122,16 @@ libarkbase_deps = [ sdk_libc_secshared_dep, ] -ohos_shared_library("libarkbase") { +source_set("libarkbase_static") { sources = libarkbase_sources - configs = libarkbase_configs + public_configs = libarkbase_configs deps = libarkbase_deps +} +ohos_shared_library("libarkbase") { + deps = [ ":libarkbase_static" ] output_extension = "so" if (!is_standard_system) { relative_install_dir = "ark" @@ -137,13 +140,16 @@ ohos_shared_library("libarkbase") { part_name = "ark" } -ohos_static_library("libarkbase_frontend_static") { +source_set("libarkbase_frontend_set_static") { sources = libarkbase_sources - configs = libarkbase_configs + public_configs = libarkbase_configs deps = libarkbase_deps +} +ohos_static_library("libarkbase_frontend_static") { + deps = [ ":libarkbase_frontend_set_static" ] subsystem_name = "ark" part_name = "ark" } diff --git a/libpandafile/BUILD.gn b/libpandafile/BUILD.gn index 7668c90834e005d3d3590ecfce34bbc31841fa14..ddc6a3a37a683930ce3f780574f0a5dfe5974319 100644 --- a/libpandafile/BUILD.gn +++ b/libpandafile/BUILD.gn @@ -57,10 +57,10 @@ libarkfile_configs = [ ":arkfile_public_config", ] -ohos_shared_library("libarkfile") { +source_set("libarkfile_static") { sources = libarkfile_sources - configs = libarkfile_configs + public_configs = libarkfile_configs deps = [ ":isa_gen_libarkfile_bytecode_emitter_def_gen_h", @@ -74,6 +74,10 @@ ohos_shared_library("libarkfile") { "$ark_root/libziparchive:libarkziparchive", sdk_libc_secshared_dep, ] +} + +ohos_shared_library("libarkfile") { + deps = [ ":libarkfile_static" ] if (!is_standard_system) { relative_install_dir = "ark" @@ -83,10 +87,10 @@ ohos_shared_library("libarkfile") { part_name = "ark" } -ohos_static_library("libarkfile_frontend_static") { +source_set("libarkfile_frontend_set_static") { sources = libarkfile_sources - configs = libarkfile_configs + public_configs = libarkfile_configs deps = [ ":isa_gen_libarkfile_bytecode_emitter_def_gen_h", @@ -100,6 +104,10 @@ ohos_static_library("libarkfile_frontend_static") { "$ark_root/libziparchive:libarkziparchive_frontend_static", sdk_libc_secshared_dep, ] +} + +ohos_static_library("libarkfile_frontend_static") { + deps = [ ":libarkfile_frontend_set_static" ] part_name = "ark" subsystem_name = "ark" diff --git a/libpandafile/external/BUILD.gn b/libpandafile/external/BUILD.gn index 2a87a5abea2f5847e1213e90c3aa8e2ed3427187..1a301daa3d0aae69f765bd92864bb406ed9434bd 100644 --- a/libpandafile/external/BUILD.gn +++ b/libpandafile/external/BUILD.gn @@ -21,10 +21,10 @@ config("libarkfileExt_config") { ] } -ohos_shared_library("libarkfileExt") { +source_set("libarkfileExt_static") { sources = [ "file_ext.cpp" ] - configs = [ + public_configs = [ "$ark_root:ark_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/libpandafile:arkfile_public_config", @@ -36,6 +36,10 @@ ohos_shared_library("libarkfileExt") { "$ark_root/libpandabase:libarkbase", "$ark_root/libpandafile:libarkfile", ] +} + +ohos_shared_library("libarkfileExt") { + deps = [ ":libarkfileExt_static" ] if (!is_standard_system) { relative_install_dir = "ark" } @@ -50,10 +54,10 @@ config("libarksupport_config") { ] } -ohos_shared_library("libarksupport") { +source_set("libarksupport_static") { sources = [ "panda_file_support.cpp" ] - configs = [ + public_configs = [ "$ark_root:ark_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/libpandafile:arkfile_public_config", @@ -65,6 +69,10 @@ ohos_shared_library("libarksupport") { "$ark_root/libpandabase:libarkbase", "$ark_root/libpandafile:libarkfile", ] +} + +ohos_shared_library("libarksupport") { + deps = [ ":libarksupport_static" ] if (!is_standard_system) { relative_install_dir = "ark" } diff --git a/libziparchive/BUILD.gn b/libziparchive/BUILD.gn index c180e409530a15376b10ae54d7c5b9b716aa9ea5..f5be50a0965a42e6fa080dcef7d8178c0e557bd0 100644 --- a/libziparchive/BUILD.gn +++ b/libziparchive/BUILD.gn @@ -30,10 +30,10 @@ config("arkziparchive_config") { } } -ohos_shared_library("libarkziparchive") { +source_set("libarkziparchive_static") { sources = [ "zip_archive.cpp" ] - configs = [ + public_configs = [ ":arkziparchive_config", "$ark_root:ark_config", sdk_libc_secshared_config, @@ -49,6 +49,10 @@ ohos_shared_library("libarkziparchive") { } else { deps += [ "$ark_third_party_root/miniz:libminiz" ] } +} + +ohos_shared_library("libarkziparchive") { + deps = [ ":libarkziparchive_static" ] if (!is_standard_system) { relative_install_dir = "ark" } @@ -57,10 +61,10 @@ ohos_shared_library("libarkziparchive") { part_name = "ark" } -ohos_static_library("libarkziparchive_frontend_static") { +source_set("libarkziparchive_frontend_set_static") { sources = [ "zip_archive.cpp" ] - configs = [ + public_configs = [ ":arkziparchive_config", "$ark_root:ark_config", sdk_libc_secshared_config, @@ -76,6 +80,10 @@ ohos_static_library("libarkziparchive_frontend_static") { } else { deps += [ "$ark_third_party_root/miniz:libminiz" ] } +} + +ohos_static_library("libarkziparchive_frontend_static") { + deps = [ ":libarkziparchive_frontend_set_static" ] subsystem_name = "ark" part_name = "ark" diff --git a/panda/BUILD.gn b/panda/BUILD.gn index 057113ea57133dd746eb45cffd8c7339b0bf65d1..d37d7e216dc19a99393e4fb4969d0f6cb3107731 100644 --- a/panda/BUILD.gn +++ b/panda/BUILD.gn @@ -14,10 +14,10 @@ import("//ark/runtime_core/ark_config.gni") import("//build/ohos.gni") -ohos_executable("ark_bin") { +source_set("ark_bin_static") { sources = [ "panda.cpp" ] - configs = [ + public_configs = [ "$ark_root:ark_config", "$ark_root/runtime:arkruntime_public_config", "$ark_root/libpandabase:arkbase_public_config", @@ -35,7 +35,10 @@ ohos_executable("ark_bin") { deps += [ "//ark/js_runtime:libark_jsruntime" ] configs += [ "//ark/js_runtime:ark_jsruntime_public_config" ] } +} +ohos_executable("ark_bin") { + deps = [ ":ark_bin_static" ] output_name = "ark" install_enable = true subsystem_name = "ark" diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn index 4f259c25a447cc52a59a52cc9107152622aedad9..57a380742d0fcaad427b0a5a6e6825c344de1982 100644 --- a/runtime/BUILD.gn +++ b/runtime/BUILD.gn @@ -63,7 +63,7 @@ group("arkruntime_header_deps") { ] } -ohos_static_library("libarkruntime_static") { +source_set("libarkruntime_set_static") { sources = [ "arch/asm_support.cpp", "assert_gc_scope.cpp", @@ -214,7 +214,7 @@ ohos_static_library("libarkruntime_static") { sources += core_vm_sources sources += verifier_sources - configs = [ + public_configs = [ "$ark_root:ark_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/libpandafile:arkfile_public_config", @@ -263,6 +263,10 @@ ohos_static_library("libarkruntime_static") { current_cpu == "x86_64") { ldflags = [ "-latomic" ] } +} + +ohos_static_library("libarkruntime_static") { + deps = [ ":libarkruntime_set_static" ] output_extension = "a" subsystem_name = "ark" @@ -316,10 +320,10 @@ config("arkruntime_interpreter_impl_config") { } } -ohos_static_library("arkruntime_interpreter_impl") { +source_set("arkruntime_interpreter_impl_static") { sources = [ "interpreter/interpreter_impl.cpp" ] - configs = [ + public_configs = [ "$ark_root:ark_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/libpandafile:arkfile_public_config", @@ -333,6 +337,10 @@ ohos_static_library("arkruntime_interpreter_impl") { "$ark_root/libpandabase:libarkbase", "$ark_root/libpandafile:libarkfile", ] +} + +ohos_static_library("arkruntime_interpreter_impl") { + deps = [ ":arkruntime_interpreter_impl_static" ] subsystem_name = "ark" part_name = "ark" diff --git a/verification/verifier/BUILD.gn b/verification/verifier/BUILD.gn index eb70ec84bce8720c8899ca62fb751c540e2ce074..4ccfb01731a75f5738269ecf6b82f35fb504d269 100644 --- a/verification/verifier/BUILD.gn +++ b/verification/verifier/BUILD.gn @@ -14,10 +14,10 @@ import("//ark/runtime/ark_config.gni") import("//build/ohos.gni") -ohos_executable("verifier_bin") { +source_set("verifier_bin_static") { sources = [ "verifier.cpp" ] - configs = [ + public_configs = [ "$ark_root:ark_config", "$ark_root/runtime:arkruntime_public_config", "$ark_root/libpandabase:arkbase_public_config", @@ -31,6 +31,10 @@ ohos_executable("verifier_bin") { "$ark_root/libpandafile:libarkfile", "$ark_root/runtime:libarkruntime", ] +} + +ohos_executable("verifier_bin") { + deps = [ ":verifier_bin_static" ] output_name = "verifier" install_enable = true