diff --git a/bundle.json b/bundle.json index bf13d42..db6ba7d 100644 --- a/bundle.json +++ b/bundle.json @@ -13,7 +13,12 @@ "name": "ability_lite", "subsystem": "ability", "syscap": [], - "features": [], + "features": [ + "ability_lite_enable_ohos_appexecfwk_feature_ability", + "ability_lite_enable_ohos_aafwk_multi_tasks_feature", + "ability_lite_config_ohos_aafwk_ams_task_size", + "ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size" + ], "adapted_system_type": [ "mini", "small" diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index d396ddf..e9a9bdf 100644 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -77,7 +77,7 @@ lite_library("ability") { "src/ability_thread.cpp", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { sources += [ "src/ability_slice.cpp", "src/ability_slice_manager.cpp", @@ -131,7 +131,7 @@ lite_library("ability") { } cflags_cc = cflags - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { public_deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite" ] } @@ -141,13 +141,13 @@ lite_library("ability") { defines += [ "OPENHARMONY_FONT_PATH" ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { defines += [ "ABILITY_WINDOW_SUPPORT" ] } } lite_component("aafwk_abilitykit_lite") { - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { public_configs = [ ":abilitykit_config" ] } diff --git a/frameworks/ability_lite/example/BUILD.gn b/frameworks/ability_lite/example/BUILD.gn index 0546e47..a15d5a5 100644 --- a/frameworks/ability_lite/example/BUILD.gn +++ b/frameworks/ability_lite/example/BUILD.gn @@ -24,7 +24,7 @@ lite_library("hiability") { "${src_path}/service_ability.cpp", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { sources += [ "${src_path}/main_ability.cpp", "${src_path}/main_ability_slice.cpp", @@ -52,7 +52,7 @@ lite_library("hiability") { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite" ] defines += [ "ENABLE_WINDOW=1", diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index a084d9c..ab6511f 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -34,9 +34,9 @@ lite_library("abilityms") { "src/slite/slite_ability_loader.cpp", ] - if (defined(config_ohos_aafwk_ams_task_size) && - config_ohos_aafwk_ams_task_size > 0) { - defines = [ "AMS_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size" ] + if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && + ability_lite_config_ohos_aafwk_ams_task_size > 0) { + defines = [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] } if (defined(config_ohos_aafwk_ability_list_capacity) && @@ -45,15 +45,15 @@ lite_library("abilityms") { [ "ABILITY_LIST_CAPACITY=$config_ohos_aafwk_ability_list_capacity" ] } - if (defined(config_ohos_aafwk_aafwk_lite_task_stack_size) && - config_ohos_aafwk_aafwk_lite_task_stack_size > 0) { + if (defined(ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size) && + ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size > 0) { defines += [ - "TASK_STACK_SIZE=$config_ohos_aafwk_aafwk_lite_task_stack_size", - "NATIVE_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size", + "TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size", + "NATIVE_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size", ] } - if (enable_ohos_aafwk_multi_tasks_feature == true) { + if (ability_lite_enable_ohos_aafwk_multi_tasks_feature == true) { defines += [ "_MINI_MULTI_TASKS_" ] } @@ -136,12 +136,12 @@ lite_library("abilityms") { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - if (defined(config_ohos_aafwk_ams_task_size) && - config_ohos_aafwk_ams_task_size > 0) { - defines += [ "AMS_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size" ] + if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && + ability_lite_config_ohos_aafwk_ams_task_size > 0) { + defines += [ "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size" ] } - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/surface_lite" ] defines += [ "ABILITY_WINDOW_SUPPORT" ] } diff --git a/services/abilitymgr_lite/tools/BUILD.gn b/services/abilitymgr_lite/tools/BUILD.gn index b229ac0..3f1112b 100644 --- a/services/abilitymgr_lite/tools/BUILD.gn +++ b/services/abilitymgr_lite/tools/BUILD.gn @@ -51,7 +51,7 @@ executable("aa") { "//build/lite/config/component/cJSON:cjson_shared", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite", "${graphic_path}/graphic_utils_lite:utils_lite",