From 26e7718501b0c444c591c07e573ef2fe5b34c21f Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 29 Jul 2024 08:59:32 +0000 Subject: [PATCH 1/2] update arkoala/framework/native/meson.build. Signed-off-by: Igor Loginov --- arkoala/framework/native/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arkoala/framework/native/meson.build b/arkoala/framework/native/meson.build index 3070a869d..30f12fb4e 100644 --- a/arkoala/framework/native/meson.build +++ b/arkoala/framework/native/meson.build @@ -43,11 +43,14 @@ node_include_dirs = [ node_headers / 'node-addon-api' ] -is_jni = get_option('jdk_dir') != '' or get_option('vm_kind') == 'jvm' -is_napi = not is_jni is_msvc = meson.get_compiler('cpp').get_id() == 'msvc' -is_node = get_option('vm_kind') != 'arkjs' +is_napi = get_option('vm_kind') == 'node' or get_option('vm_kind') == 'arkjs' +is_etsapi = get_option('vm_kind') == 'arkts' +is_jni = get_option('vm_kind') == 'jvm' +is_node = get_option('vm_kind') == 'node' is_ark_js = get_option('vm_kind') == 'arkjs' +is_ark_ets = get_option('vm_kind') == 'arkts' +is_jvm = get_option('vm_kind') == 'jvm' # To control if we use dummy or libace based implementation is_dummy_impl = is_node is_ohos = os == 'ohos' -- Gitee From 583562af49c422c5425f47a57d395857b7f884c7 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 29 Jul 2024 09:00:42 +0000 Subject: [PATCH 2/2] update arkoala/framework/native/meson_options.txt. Signed-off-by: Igor Loginov --- arkoala/framework/native/meson_options.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arkoala/framework/native/meson_options.txt b/arkoala/framework/native/meson_options.txt index f55636387..45395e879 100644 --- a/arkoala/framework/native/meson_options.txt +++ b/arkoala/framework/native/meson_options.txt @@ -1,5 +1,4 @@ -option('vm_kind', type : 'string', value : 'arkjs:node', +option('vm_kind', type : 'string', value : 'node', description : 'VM type') option('jdk_dir', type : 'string', value : '', description : 'A path to JDK root') - -- Gitee