diff --git a/ace_config.gni b/ace_config.gni index 436c63f6dae..15e2647ecb4 100644 --- a/ace_config.gni +++ b/ace_config.gni @@ -91,7 +91,7 @@ if (is_standard_system) { # Config part name if (is_standard_system) { - ace_engine_part = "ace_engine_standard" + ace_engine_part = "ace_engine" hilog_deps = [ "hiviewdfx_hilog_native:libhilog" ] ark_runtime_path = "//ark/runtime_core" } else { diff --git a/adapter/ohos/build/bundle.json b/adapter/ohos/build/bundle.json index b9842bb8e0a..f8bffec85d7 100644 --- a/adapter/ohos/build/bundle.json +++ b/adapter/ohos/build/bundle.json @@ -1,5 +1,5 @@ { - "name": "@ohos/ace_engine_standard", + "name": "@ohos/ace_engine", "description": "ArkUI Cross-Platform Engine for UI layout measure and paint", "version": "3.1", "license": "Apache 2.0", @@ -10,7 +10,7 @@ "dirs": {}, "scripts": {}, "component": { - "name": "ace_engine_standard", + "name": "ace_engine", "subsystem": "arkui", "syscap": [], "features": [], diff --git a/adapter/ohos/build/ohos.build b/adapter/ohos/build/ohos.build index 09ae5717620..274466c09f2 100644 --- a/adapter/ohos/build/ohos.build +++ b/adapter/ohos/build/ohos.build @@ -1,7 +1,7 @@ { "subsystem": "arkui", "parts": { - "ace_engine_standard": { + "ace_engine": { "version": "1.0.0", "interface-version": {}, "variants": [ diff --git a/adapter/ohos/services/uiservice/dialog_ui/dialog_picker/js/BUILD.gn b/adapter/ohos/services/uiservice/dialog_ui/dialog_picker/js/BUILD.gn index 357cecc27fd..fbc3fe59844 100644 --- a/adapter/ohos/services/uiservice/dialog_ui/dialog_picker/js/BUILD.gn +++ b/adapter/ohos/services/uiservice/dialog_ui/dialog_picker/js/BUILD.gn @@ -40,6 +40,6 @@ gen_sa_dialog_js("dialog_picker_js_files_etc") { "common/ic_xls.png", ] dialog_name = "dialog_picker_service" - part_name = "ace_engine_standard" + part_name = ace_engine_part subsystem_name = "arkui" } diff --git a/adapter/preview/entrance/samples/BUILD.gn b/adapter/preview/entrance/samples/BUILD.gn index ab5da2ad28f..fced2f889a2 100644 --- a/adapter/preview/entrance/samples/BUILD.gn +++ b/adapter/preview/entrance/samples/BUILD.gn @@ -236,9 +236,9 @@ ohos_copy("copy_napi_modules_shared_library") { "root_out_dir") deps += [ "$ace_root/interfaces/napi/kits:${module}" ] if (use_mac) { - sources += [ "${out_path}/arkui/ace_engine_standard/lib${module}.dylib" ] + sources += [ "${out_path}/arkui/ace_engine/lib${module}.dylib" ] } else { - sources += [ "${out_path}/arkui/ace_engine_standard/lib${module}.dll" ] + sources += [ "${out_path}/arkui/ace_engine/lib${module}.dll" ] } } diff --git a/adapter/preview/sdk/BUILD.gn b/adapter/preview/sdk/BUILD.gn index 3db6583d61c..dfa26935e25 100644 --- a/adapter/preview/sdk/BUILD.gn +++ b/adapter/preview/sdk/BUILD.gn @@ -190,10 +190,9 @@ if (is_standard_system) { "root_out_dir") deps += [ "$ace_root/interfaces/napi/kits:${module}" ] if (use_mac) { - sources += - [ "${out_path}/arkui/ace_engine_standard/lib${module}.dylib" ] + sources += [ "${out_path}/arkui/ace_engine/lib${module}.dylib" ] } else { - sources += [ "${out_path}/arkui/ace_engine_standard/lib${module}.dll" ] + sources += [ "${out_path}/arkui/ace_engine/lib${module}.dll" ] } } diff --git a/frameworks/base/test/unittest/json_util/BUILD.gn b/frameworks/base/test/unittest/json_util/BUILD.gn index 74e45d1b848..c968f79c8eb 100644 --- a/frameworks/base/test/unittest/json_util/BUILD.gn +++ b/frameworks/base/test/unittest/json_util/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/frameworkbasicability/jsonutil" + module_output_path = "ace_engine/frameworkbasicability/jsonutil" } else { module_output_path = "ace_engine_full/frameworkbasicability/jsonutil" } @@ -36,13 +36,7 @@ ohos_unittest("JsonUtilsTest") { "//utils/native/base:utils", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/base/test/unittest/task_executor/BUILD.gn b/frameworks/base/test/unittest/task_executor/BUILD.gn index 4eaab10ccc2..9ffd34a6501 100644 --- a/frameworks/base/test/unittest/task_executor/BUILD.gn +++ b/frameworks/base/test/unittest/task_executor/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/frameworkbasicability/executor" + module_output_path = "ace_engine/frameworkbasicability/executor" } else { module_output_path = "ace_engine_full/frameworkbasicability/executor" } @@ -33,13 +33,7 @@ ohos_unittest("TaskExecutorsTest") { "$ace_root/build:ace_ohos_unittest_base", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/dombutton/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/dombutton/BUILD.gn index 4e7e25ab35e..895a054bf85 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/dombutton/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/dombutton/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomCardButtonTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/domclock/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/domclock/BUILD.gn index 0b7f145adf8..ac0c82e9c5f 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/domclock/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/domclock/BUILD.gn @@ -32,13 +32,7 @@ ohos_unittest("DomCardClockTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/domdiv/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/domdiv/BUILD.gn index bf700c63cab..c3c4bd59dba 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/domdiv/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/domdiv/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomCardDivTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/domimage/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/domimage/BUILD.gn index a9d608b95ae..663415f0d74 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/domimage/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/domimage/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomCardImageTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/domprogress/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/domprogress/BUILD.gn index 7f8211d594c..b75ba2327fe 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/domprogress/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/domprogress/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomCardProgressTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/domstack/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/domstack/BUILD.gn index 665fdb8afc5..5e616cb34ef 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/domstack/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/domstack/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomCardStackTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/domtext/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/domtext/BUILD.gn index d3439374276..b0679ed893b 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/domtext/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/domtext/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomCardTextTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/frontend/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/frontend/BUILD.gn index 5acb910f126..9dbdeaff3b9 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/frontend/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/frontend/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("CardFrontendTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/cardfrontend/mediaquery/BUILD.gn b/frameworks/bridge/test/unittest/cardfrontend/mediaquery/BUILD.gn index a0a9314f6ee..4690c5238e6 100644 --- a/frameworks/bridge/test/unittest/cardfrontend/mediaquery/BUILD.gn +++ b/frameworks/bridge/test/unittest/cardfrontend/mediaquery/BUILD.gn @@ -25,13 +25,8 @@ ohos_unittest("MediaQueryTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + subsystem_name = "arkui" + part_name = ace_engine_part } config("config_media_query_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/animation/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/animation/BUILD.gn index 8e1e2c71387..f7aa3deca26 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/animation/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/animation/BUILD.gn @@ -44,13 +44,7 @@ ohos_unittest("AnimatorApiTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/codec/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/codec/BUILD.gn index c05bc0751cb..12d3101d7fb 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/codec/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/codec/BUILD.gn @@ -25,13 +25,7 @@ ohos_unittest("GroupMessageCodecTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/dombutton/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/dombutton/BUILD.gn index 68e3055d312..e6931f37f57 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/dombutton/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/dombutton/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomButtonTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domdiv/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domdiv/BUILD.gn index b2db417a335..7837bdaad94 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domdiv/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domdiv/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomDivTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domdivider/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domdivider/BUILD.gn index 0f7d89b7fb6..b8625b4ca15 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domdivider/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domdivider/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomDividerTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domimage/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domimage/BUILD.gn index 14468e93094..5e691fe2103 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domimage/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domimage/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomImageTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domimageanimator/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domimageanimator/BUILD.gn index 428df7e7df1..f719f831f3d 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domimageanimator/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domimageanimator/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomImageAnimatorTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/dominput/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/dominput/BUILD.gn index 723b73c5cf1..bf0250b49d3 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/dominput/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/dominput/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomInputTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domlabel/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domlabel/BUILD.gn index 9d8c93f466a..84aa39629b2 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domlabel/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domlabel/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomLabelTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domlist/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domlist/BUILD.gn index 81ba398812e..7f1b95146a8 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domlist/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domlist/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomListTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domnode/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domnode/BUILD.gn index 91272ef1a88..a2d6dd66cb1 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domnode/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domnode/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomNodeTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/dompiece/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/dompiece/BUILD.gn index 0721374b243..3e56100e505 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/dompiece/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/dompiece/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomPieceTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/dompopup/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/dompopup/BUILD.gn index 38b792ca61e..01eac90d37f 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/dompopup/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/dompopup/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomPopupTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domrating/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domrating/BUILD.gn index fc96ef99e41..8a2f7566e28 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domrating/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domrating/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomRatingTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domrefresh/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domrefresh/BUILD.gn index 6dd14339975..ed46e2588ab 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domrefresh/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domrefresh/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomRefreshTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domsearch/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domsearch/BUILD.gn index ef0dfa93c14..4ecd7799c03 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domsearch/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domsearch/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomSearchTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domspan/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domspan/BUILD.gn index 087c2b62932..872a0f85964 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domspan/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domspan/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomSpanTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domsvg/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domsvg/BUILD.gn index 1257671bbff..0818b6c9f1e 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domsvg/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domsvg/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomSvgTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domsvgtext/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domsvgtext/BUILD.gn index 6e064a70544..965d079ba95 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domsvgtext/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domsvgtext/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomSvgTextTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domtab/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domtab/BUILD.gn index 1cb19a6678d..dc32633e8fa 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domtab/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domtab/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomTabTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domtext/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domtext/BUILD.gn index 0b0bfd898b4..3d73515b8a5 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domtext/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domtext/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomTextTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/domtextarea/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/domtextarea/BUILD.gn index 014a6d93867..7475ff41224 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/domtextarea/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/domtextarea/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomTextareaTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/event/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/event/BUILD.gn index 2f022593b8f..b769eba5358 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/event/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/event/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("CommonEventTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/manifest/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/manifest/BUILD.gn index 3bfe02a5630..7b86c3b0ae6 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/manifest/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/manifest/BUILD.gn @@ -30,13 +30,7 @@ ohos_unittest("ManifestWindowTest") { external_deps = [ "ability_base:configuration" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_manifest_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/marquee/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/marquee/BUILD.gn index 36d24d3bd15..5f2ddd37d8e 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/marquee/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/marquee/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomMarqueeTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/progress/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/progress/BUILD.gn index 00d82516ee8..5ba7260cc8e 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/progress/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/progress/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomProgressTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/slider/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/slider/BUILD.gn index 7fef430b555..2e2700b6c49 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/slider/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/slider/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomSliderTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/swiper/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/swiper/BUILD.gn index 0ba610b4e74..2dd7a120ae3 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/swiper/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/swiper/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomSwiperTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/switch/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/switch/BUILD.gn index 55258676aef..40b2f4d9df4 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/switch/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/switch/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomSwitchTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/utils/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/utils/BUILD.gn index 82e8f496cd9..0e9cd999b80 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/utils/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/utils/BUILD.gn @@ -28,13 +28,7 @@ ohos_unittest("JsUtilsTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_js_utils_test") { diff --git a/frameworks/bridge/test/unittest/jsfrontend/video/BUILD.gn b/frameworks/bridge/test/unittest/jsfrontend/video/BUILD.gn index c71df08281f..d6fe619d192 100644 --- a/frameworks/bridge/test/unittest/jsfrontend/video/BUILD.gn +++ b/frameworks/bridge/test/unittest/jsfrontend/video/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("DomVideoTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/bridge/test/unittest/pluginfrontend/BUILD.gn b/frameworks/bridge/test/unittest/pluginfrontend/BUILD.gn index b5a4e362fb1..913c15b05cd 100644 --- a/frameworks/bridge/test/unittest/pluginfrontend/BUILD.gn +++ b/frameworks/bridge/test/unittest/pluginfrontend/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("PluginFrontendDelegateTest") { "$ace_root/build:ace_ohos_unittest_base", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginFrontendTest") { @@ -55,13 +49,7 @@ ohos_unittest("PluginFrontendTest") { "$ace_root/build:ace_ohos_unittest_base", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_domnode_test") { diff --git a/frameworks/core/animation/test/unittest/framework/BUILD.gn b/frameworks/core/animation/test/unittest/framework/BUILD.gn index ba9be7880fd..5e24994f781 100644 --- a/frameworks/core/animation/test/unittest/framework/BUILD.gn +++ b/frameworks/core/animation/test/unittest/framework/BUILD.gn @@ -225,13 +225,7 @@ ohos_unittest("AnimationTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_animation_test") { diff --git a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn index c7ada974e53..33f96ecd062 100644 --- a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn +++ b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn @@ -230,13 +230,7 @@ ohos_unittest("SpringChainTest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_animation_test") { diff --git a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn index 010158ac13e..5e324296f78 100644 --- a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn +++ b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn @@ -229,13 +229,7 @@ ohos_unittest("SvgAnimateTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_animation_test") { diff --git a/frameworks/core/common/test/unittest/plugin/BUILD.gn b/frameworks/core/common/test/unittest/plugin/BUILD.gn index 5099fa651dd..509bd36332e 100644 --- a/frameworks/core/common/test/unittest/plugin/BUILD.gn +++ b/frameworks/core/common/test/unittest/plugin/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/plugin" + module_output_path = "ace_engine/backenduicomponent/plugin" } else { module_output_path = "ace_engine_full/backenduicomponent/plugin" } @@ -46,13 +46,7 @@ ohos_unittest("PluginManagerTest") { "eventhandler:libeventhandler", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/common/properties/test/unittest/alignment/BUILD.gn b/frameworks/core/components/common/properties/test/unittest/alignment/BUILD.gn index 06c9fd3ba45..ff3bc563312 100644 --- a/frameworks/core/components/common/properties/test/unittest/alignment/BUILD.gn +++ b/frameworks/core/components/common/properties/test/unittest/alignment/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/align" + module_output_path = "ace_engine/backenduicomponent/align" } else { module_output_path = "ace_engine_full/backenduicomponent/align" } @@ -32,13 +32,7 @@ ohos_unittest("AlignmentTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("alignment_test") { diff --git a/frameworks/core/components/common/properties/test/unittest/color/BUILD.gn b/frameworks/core/components/common/properties/test/unittest/color/BUILD.gn index 39b200da9f4..f015bbdc6bf 100644 --- a/frameworks/core/components/common/properties/test/unittest/color/BUILD.gn +++ b/frameworks/core/components/common/properties/test/unittest/color/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/color" + module_output_path = "ace_engine/backenduicomponent/color" } else { module_output_path = "ace_engine_full/backenduicomponent/color" } @@ -32,13 +32,7 @@ ohos_unittest("ColorPropertyTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("color_test") { diff --git a/frameworks/core/components/test/unittest/align/BUILD.gn b/frameworks/core/components/test/unittest/align/BUILD.gn index bfb7b869d0e..6072052b052 100644 --- a/frameworks/core/components/test/unittest/align/BUILD.gn +++ b/frameworks/core/components/test/unittest/align/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/align" + module_output_path = "ace_engine/backenduicomponent/align" } else { module_output_path = "ace_engine_full/backenduicomponent/align" } @@ -35,13 +35,7 @@ ohos_unittest("AlignCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/border/BUILD.gn b/frameworks/core/components/test/unittest/border/BUILD.gn index 2308513cd52..2c20f01ca6d 100644 --- a/frameworks/core/components/test/unittest/border/BUILD.gn +++ b/frameworks/core/components/test/unittest/border/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/border" + module_output_path = "ace_engine/backenduicomponent/border" } else { module_output_path = "ace_engine_full/backenduicomponent/border" } @@ -39,13 +39,7 @@ ohos_unittest("BorderCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/box/BUILD.gn b/frameworks/core/components/test/unittest/box/BUILD.gn index 3b2c447475b..b0eeb0cb63b 100644 --- a/frameworks/core/components/test/unittest/box/BUILD.gn +++ b/frameworks/core/components/test/unittest/box/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/box" + module_output_path = "ace_engine/backenduicomponent/box" } else { module_output_path = "ace_engine_full/backenduicomponent/box" } @@ -38,13 +38,7 @@ ohos_unittest("BoxCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("RenderBoxTest") { @@ -61,13 +55,7 @@ ohos_unittest("RenderBoxTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("RenderBoxPercentTest") { @@ -93,13 +81,7 @@ ohos_unittest("RenderBoxPercentTest") { "$ace_flutter_engine_root/icu:icu_config_ohos", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("MouseHoverTest") { @@ -116,13 +98,7 @@ ohos_unittest("MouseHoverTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("MouseHoverAnimationTest") { @@ -139,13 +115,7 @@ ohos_unittest("MouseHoverAnimationTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/button/BUILD.gn b/frameworks/core/components/test/unittest/button/BUILD.gn index 32e10910a3d..46619a41488 100644 --- a/frameworks/core/components/test/unittest/button/BUILD.gn +++ b/frameworks/core/components/test/unittest/button/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/button" + module_output_path = "ace_engine/backenduicomponent/button" } else { module_output_path = "ace_engine_full/backenduicomponent/button" } @@ -35,13 +35,7 @@ ohos_unittest("ButtonCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/camera/BUILD.gn b/frameworks/core/components/test/unittest/camera/BUILD.gn index c9c0312a9d4..29dda2aa3a0 100644 --- a/frameworks/core/components/test/unittest/camera/BUILD.gn +++ b/frameworks/core/components/test/unittest/camera/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/camera" + module_output_path = "ace_engine/backenduicomponent/camera" } else { module_output_path = "ace_engine_full/backenduicomponent/camera" } @@ -32,13 +32,7 @@ ohos_unittest("CameraComponentTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/checkable/BUILD.gn b/frameworks/core/components/test/unittest/checkable/BUILD.gn index 7d87778904d..111ea7c9d0d 100644 --- a/frameworks/core/components/test/unittest/checkable/BUILD.gn +++ b/frameworks/core/components/test/unittest/checkable/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("CheckableCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -269,13 +263,7 @@ ohos_unittest("CheckableComponentTest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_checkable_test") { diff --git a/frameworks/core/components/test/unittest/decoration/BUILD.gn b/frameworks/core/components/test/unittest/decoration/BUILD.gn index 404aec24385..0c91a36cdc1 100644 --- a/frameworks/core/components/test/unittest/decoration/BUILD.gn +++ b/frameworks/core/components/test/unittest/decoration/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/decoration" + module_output_path = "ace_engine/backenduicomponent/decoration" } else { module_output_path = "ace_engine_full/backenduicomponent/decoration" } @@ -35,13 +35,7 @@ ohos_unittest("DecorationCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/dialog/BUILD.gn b/frameworks/core/components/test/unittest/dialog/BUILD.gn index 836c2421c90..1a9318c0b3c 100644 --- a/frameworks/core/components/test/unittest/dialog/BUILD.gn +++ b/frameworks/core/components/test/unittest/dialog/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/dialogandpopup" + module_output_path = "ace_engine/backenduicomponent/dialogandpopup" } else { module_output_path = "ace_engine_full/backenduicomponent/dialogandpopup" } @@ -39,13 +39,7 @@ ohos_unittest("DialogCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -76,13 +70,7 @@ ohos_unittest("RenderDialogTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_dialog_test") { @@ -108,13 +96,7 @@ ohos_unittest("DialogComponentTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_component_build_test") { diff --git a/frameworks/core/components/test/unittest/display/BUILD.gn b/frameworks/core/components/test/unittest/display/BUILD.gn index f0c304c3580..128ba5d7605 100644 --- a/frameworks/core/components/test/unittest/display/BUILD.gn +++ b/frameworks/core/components/test/unittest/display/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/display" + module_output_path = "ace_engine/backenduicomponent/display" } else { module_output_path = "ace_engine_full/backenduicomponent/display" } @@ -35,13 +35,7 @@ ohos_unittest("DisplayCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -70,13 +64,7 @@ ohos_unittest("RenderDisplayTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_display_test") { diff --git a/frameworks/core/components/test/unittest/divider/BUILD.gn b/frameworks/core/components/test/unittest/divider/BUILD.gn index c46d24fddb0..5dfdd77c0e3 100644 --- a/frameworks/core/components/test/unittest/divider/BUILD.gn +++ b/frameworks/core/components/test/unittest/divider/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/divider" + module_output_path = "ace_engine/backenduicomponent/divider" } else { module_output_path = "ace_engine_full/backenduicomponent/divider" } @@ -35,13 +35,7 @@ ohos_unittest("DividerCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/drag_bar/BUILD.gn b/frameworks/core/components/test/unittest/drag_bar/BUILD.gn index 2ec2682a9f2..dfd8e75e3d7 100644 --- a/frameworks/core/components/test/unittest/drag_bar/BUILD.gn +++ b/frameworks/core/components/test/unittest/drag_bar/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/drag_bar" + module_output_path = "ace_engine/backenduicomponent/drag_bar" } else { module_output_path = "ace_engine_full/backenduicomponent/drag_bar" } @@ -33,13 +33,7 @@ ohos_unittest("RenderDragBarTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/flex/BUILD.gn b/frameworks/core/components/test/unittest/flex/BUILD.gn index 5ab03695cc8..6ddff40a956 100644 --- a/frameworks/core/components/test/unittest/flex/BUILD.gn +++ b/frameworks/core/components/test/unittest/flex/BUILD.gn @@ -36,13 +36,7 @@ ohos_unittest("RenderFlexTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_flex_test") { @@ -71,13 +65,7 @@ ohos_unittest("FlexCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/gestures/BUILD.gn b/frameworks/core/components/test/unittest/gestures/BUILD.gn index c7e5c1fb8a5..d5f28a9adf5 100644 --- a/frameworks/core/components/test/unittest/gestures/BUILD.gn +++ b/frameworks/core/components/test/unittest/gestures/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/graphicalbasicability/gesture" + module_output_path = "ace_engine/graphicalbasicability/gesture" } else { module_output_path = "ace_engine_full/graphicalbasicability/gesture" } @@ -33,13 +33,7 @@ ohos_unittest("GestureComponentTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/grid/BUILD.gn b/frameworks/core/components/test/unittest/grid/BUILD.gn index 8386e760680..037e50e077a 100644 --- a/frameworks/core/components/test/unittest/grid/BUILD.gn +++ b/frameworks/core/components/test/unittest/grid/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/grid" + module_output_path = "ace_engine/backenduicomponent/grid" } else { module_output_path = "ace_engine_full/backenduicomponent/grid" } @@ -35,13 +35,7 @@ ohos_unittest("GridCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -63,13 +57,7 @@ ohos_unittest("RenderGridTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/grid_layout/BUILD.gn b/frameworks/core/components/test/unittest/grid_layout/BUILD.gn index bd01204d7ad..51bf398fa56 100644 --- a/frameworks/core/components/test/unittest/grid_layout/BUILD.gn +++ b/frameworks/core/components/test/unittest/grid_layout/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/gridlayout" + module_output_path = "ace_engine/backenduicomponent/gridlayout" } else { module_output_path = "ace_engine_full/backenduicomponent/gridlayout" } diff --git a/frameworks/core/components/test/unittest/image/BUILD.gn b/frameworks/core/components/test/unittest/image/BUILD.gn index a418352885e..fa9f6d1672d 100644 --- a/frameworks/core/components/test/unittest/image/BUILD.gn +++ b/frameworks/core/components/test/unittest/image/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("ImageCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -211,13 +205,7 @@ ohos_unittest("RenderImageTest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_test") { diff --git a/frameworks/core/components/test/unittest/image_animator/BUILD.gn b/frameworks/core/components/test/unittest/image_animator/BUILD.gn index 11c52a809fc..405fbf795db 100644 --- a/frameworks/core/components/test/unittest/image_animator/BUILD.gn +++ b/frameworks/core/components/test/unittest/image_animator/BUILD.gn @@ -238,13 +238,7 @@ ohos_unittest("ImageAnimatorElementTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_tween_element_test") { diff --git a/frameworks/core/components/test/unittest/indexer/BUILD.gn b/frameworks/core/components/test/unittest/indexer/BUILD.gn index 628c0467269..5c99f853eea 100644 --- a/frameworks/core/components/test/unittest/indexer/BUILD.gn +++ b/frameworks/core/components/test/unittest/indexer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/indexer" + module_output_path = "ace_engine/backenduicomponent/indexer" } else { module_output_path = "ace_engine_full/backenduicomponent/indexer" } @@ -34,13 +34,7 @@ ohos_unittest("RenderIndexerTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/list/BUILD.gn b/frameworks/core/components/test/unittest/list/BUILD.gn index 90a464b5814..b6f31aaa092 100644 --- a/frameworks/core/components/test/unittest/list/BUILD.gn +++ b/frameworks/core/components/test/unittest/list/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/list" + module_output_path = "ace_engine/backenduicomponent/list" } else { module_output_path = "ace_engine_full/backenduicomponent/list" } @@ -35,13 +35,7 @@ ohos_unittest("ListCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -65,13 +59,7 @@ ohos_unittest("RenderListTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("ListElementTest") { @@ -92,13 +80,7 @@ ohos_unittest("ListElementTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_tabbar_element_test") { diff --git a/frameworks/core/components/test/unittest/marquee/BUILD.gn b/frameworks/core/components/test/unittest/marquee/BUILD.gn index d3a94fb26ef..7bc625a0996 100644 --- a/frameworks/core/components/test/unittest/marquee/BUILD.gn +++ b/frameworks/core/components/test/unittest/marquee/BUILD.gn @@ -31,13 +31,7 @@ ohos_unittest("MarqueeCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -252,13 +246,7 @@ ohos_unittest("RenderMarqueeTest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_marquee_test") { diff --git a/frameworks/core/components/test/unittest/menu/BUILD.gn b/frameworks/core/components/test/unittest/menu/BUILD.gn index 09ae52579f6..4bfd4b1fdb9 100644 --- a/frameworks/core/components/test/unittest/menu/BUILD.gn +++ b/frameworks/core/components/test/unittest/menu/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/menu" + module_output_path = "ace_engine/backenduicomponent/menu" } else { module_output_path = "ace_engine_full/backenduicomponent/menu" } @@ -35,13 +35,7 @@ ohos_unittest("MenuComponentTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_menu_component_test") { diff --git a/frameworks/core/components/test/unittest/padding/BUILD.gn b/frameworks/core/components/test/unittest/padding/BUILD.gn index 7402bed4c2c..9aa71fa1af3 100644 --- a/frameworks/core/components/test/unittest/padding/BUILD.gn +++ b/frameworks/core/components/test/unittest/padding/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/padding" + module_output_path = "ace_engine/backenduicomponent/padding" } else { module_output_path = "ace_engine_full/backenduicomponent/padding" } @@ -38,13 +38,7 @@ ohos_unittest("PaddingCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -67,13 +61,7 @@ ohos_unittest("RenderPaddingTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/pattern_lock/BUILD.gn b/frameworks/core/components/test/unittest/pattern_lock/BUILD.gn index bdfc01dbf8e..e5978145d80 100644 --- a/frameworks/core/components/test/unittest/pattern_lock/BUILD.gn +++ b/frameworks/core/components/test/unittest/pattern_lock/BUILD.gn @@ -14,7 +14,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/pattern_lock" + module_output_path = "ace_engine/backenduicomponent/pattern_lock" } else { module_output_path = "ace_engine_full/backenduicomponent/pattern_lock" } @@ -34,13 +34,7 @@ ohos_unittest("RenderPatternLockTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/picker/BUILD.gn b/frameworks/core/components/test/unittest/picker/BUILD.gn index af4daa2fbcd..d6baff12ccb 100644 --- a/frameworks/core/components/test/unittest/picker/BUILD.gn +++ b/frameworks/core/components/test/unittest/picker/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/picker" + module_output_path = "ace_engine/backenduicomponent/picker" } else { module_output_path = "ace_engine_full/backenduicomponent/picker" } @@ -36,13 +36,7 @@ ohos_unittest("RenderPickerTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_picker_test") { diff --git a/frameworks/core/components/test/unittest/piece/BUILD.gn b/frameworks/core/components/test/unittest/piece/BUILD.gn index edaebad4d36..fd2f2c6e625 100644 --- a/frameworks/core/components/test/unittest/piece/BUILD.gn +++ b/frameworks/core/components/test/unittest/piece/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/piece" + module_output_path = "ace_engine/backenduicomponent/piece" } else { module_output_path = "ace_engine_full/backenduicomponent/piece" } @@ -35,13 +35,7 @@ ohos_unittest("PieceComponentTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_component_build_test") { diff --git a/frameworks/core/components/test/unittest/plugin/BUILD.gn b/frameworks/core/components/test/unittest/plugin/BUILD.gn index dbe01142a5e..2d2e7429e8e 100644 --- a/frameworks/core/components/test/unittest/plugin/BUILD.gn +++ b/frameworks/core/components/test/unittest/plugin/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/plugin" + module_output_path = "ace_engine/backenduicomponent/plugin" } else { module_output_path = "ace_engine_full/backenduicomponent/plugin" } @@ -34,13 +34,7 @@ ohos_unittest("FlutterRenderPluginTest") { "$ace_root/build:ace_ohos_unittest_base", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginCallBackClientTest") { @@ -70,13 +64,7 @@ ohos_unittest("PluginCallBackClientTest") { "ipc:ipc_core", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginComponentTest") { @@ -103,13 +91,7 @@ ohos_unittest("PluginComponentTest") { "ipc:ipc_core", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginElementTest") { @@ -136,13 +118,7 @@ ohos_unittest("PluginElementTest") { "ipc:ipc_core", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginManagerDelegateTest") { @@ -171,13 +147,7 @@ ohos_unittest("PluginManagerDelegateTest") { "ipc:ipc_core", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginManagerResourceTest") { @@ -194,13 +164,7 @@ ohos_unittest("PluginManagerResourceTest") { "$ace_root/build:ace_ohos_unittest_base", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginSubContainerTest") { @@ -220,13 +184,7 @@ ohos_unittest("PluginSubContainerTest") { external_deps = [ "ability_base:want" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("PluginWindowTest") { @@ -244,13 +202,7 @@ ohos_unittest("PluginWindowTest") { "//third_party/googletest:gmock_main", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("RenderPluginTest") { @@ -265,13 +217,7 @@ ohos_unittest("RenderPluginTest") { "$ace_root/build:ace_ohos_unittest_base", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/progress/BUILD.gn b/frameworks/core/components/test/unittest/progress/BUILD.gn index 580cb136d83..e7a74ce63eb 100644 --- a/frameworks/core/components/test/unittest/progress/BUILD.gn +++ b/frameworks/core/components/test/unittest/progress/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/progress" + module_output_path = "ace_engine/backenduicomponent/progress" } else { module_output_path = "ace_engine_full/backenduicomponent/progress" } @@ -35,13 +35,7 @@ ohos_unittest("ProgressCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -64,13 +58,7 @@ ohos_unittest("RenderProgressTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/rating/BUILD.gn b/frameworks/core/components/test/unittest/rating/BUILD.gn index 52cba1c2745..3be51d758b8 100644 --- a/frameworks/core/components/test/unittest/rating/BUILD.gn +++ b/frameworks/core/components/test/unittest/rating/BUILD.gn @@ -30,13 +30,7 @@ ohos_unittest("RatingCreatorTest") { "$ace_root/build:ace_ohos_unittest_base", "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -248,13 +242,7 @@ ohos_unittest("RatingComponentTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_rating_test") { diff --git a/frameworks/core/components/test/unittest/refresh/BUILD.gn b/frameworks/core/components/test/unittest/refresh/BUILD.gn index 84be0121337..11c79c90373 100644 --- a/frameworks/core/components/test/unittest/refresh/BUILD.gn +++ b/frameworks/core/components/test/unittest/refresh/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/refresh" + module_output_path = "ace_engine/backenduicomponent/refresh" } else { module_output_path = "ace_engine_full/backenduicomponent/refresh" } @@ -33,13 +33,7 @@ ohos_unittest("RenderRefreshTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/rotation/BUILD.gn b/frameworks/core/components/test/unittest/rotation/BUILD.gn index c691f650d8a..e07ecebc837 100644 --- a/frameworks/core/components/test/unittest/rotation/BUILD.gn +++ b/frameworks/core/components/test/unittest/rotation/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/rotation" + module_output_path = "ace_engine/backenduicomponent/rotation" } else { module_output_path = "ace_engine_full/backenduicomponent/rotation" } @@ -33,13 +33,7 @@ ohos_unittest("RotationTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/scroll/BUILD.gn b/frameworks/core/components/test/unittest/scroll/BUILD.gn index 476e9486c75..ee48b7f545d 100644 --- a/frameworks/core/components/test/unittest/scroll/BUILD.gn +++ b/frameworks/core/components/test/unittest/scroll/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/scroll" + module_output_path = "ace_engine/backenduicomponent/scroll" } else { module_output_path = "ace_engine_full/backenduicomponent/scroll" } @@ -35,13 +35,7 @@ ohos_unittest("ScrollCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -65,13 +59,7 @@ ohos_unittest("RenderScrollTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/select/BUILD.gn b/frameworks/core/components/test/unittest/select/BUILD.gn index 3882b57e875..10a43746c75 100644 --- a/frameworks/core/components/test/unittest/select/BUILD.gn +++ b/frameworks/core/components/test/unittest/select/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/select" + module_output_path = "ace_engine/backenduicomponent/select" } else { module_output_path = "ace_engine_full/backenduicomponent/select" } @@ -35,13 +35,7 @@ ohos_unittest("SelectCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/semimodal/BUILD.gn b/frameworks/core/components/test/unittest/semimodal/BUILD.gn index 0d45a6300bd..c2440f51dbf 100644 --- a/frameworks/core/components/test/unittest/semimodal/BUILD.gn +++ b/frameworks/core/components/test/unittest/semimodal/BUILD.gn @@ -243,13 +243,7 @@ ohos_unittest("RenderSemiModalTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_semi_modal_test") { diff --git a/frameworks/core/components/test/unittest/shadow/BUILD.gn b/frameworks/core/components/test/unittest/shadow/BUILD.gn index 9114ff39dd4..2b5e3ee6ebd 100644 --- a/frameworks/core/components/test/unittest/shadow/BUILD.gn +++ b/frameworks/core/components/test/unittest/shadow/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/shadow" + module_output_path = "ace_engine/backenduicomponent/shadow" } else { module_output_path = "ace_engine_full/backenduicomponent/shadow" } @@ -35,13 +35,7 @@ ohos_unittest("ShadowCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/slider/BUILD.gn b/frameworks/core/components/test/unittest/slider/BUILD.gn index 2972230652d..7c61e27f502 100644 --- a/frameworks/core/components/test/unittest/slider/BUILD.gn +++ b/frameworks/core/components/test/unittest/slider/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/slider" + module_output_path = "ace_engine/backenduicomponent/slider" } else { module_output_path = "ace_engine_full/backenduicomponent/slider" } @@ -35,13 +35,7 @@ ohos_unittest("SliderCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -62,13 +56,7 @@ ohos_unittest("RenderSliderTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/stack/BUILD.gn b/frameworks/core/components/test/unittest/stack/BUILD.gn index 14253b70992..dda2ff8b633 100644 --- a/frameworks/core/components/test/unittest/stack/BUILD.gn +++ b/frameworks/core/components/test/unittest/stack/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/stack" + module_output_path = "ace_engine/backenduicomponent/stack" } else { module_output_path = "ace_engine_full/backenduicomponent/stack" } @@ -38,13 +38,7 @@ ohos_unittest("StackCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -71,13 +65,7 @@ ohos_unittest("RenderStackTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_flex_test") { diff --git a/frameworks/core/components/test/unittest/stage/BUILD.gn b/frameworks/core/components/test/unittest/stage/BUILD.gn index 36f0d364907..ec946a0d6cc 100644 --- a/frameworks/core/components/test/unittest/stage/BUILD.gn +++ b/frameworks/core/components/test/unittest/stage/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/frameworkbasicability/stage" + module_output_path = "ace_engine/frameworkbasicability/stage" } else { module_output_path = "ace_engine_full/frameworkbasicability/stage" } @@ -32,13 +32,7 @@ ohos_unittest("StageElementTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_stage_element_test") { diff --git a/frameworks/core/components/test/unittest/svg/BUILD.gn b/frameworks/core/components/test/unittest/svg/BUILD.gn index c65b67b6f34..11b96aa659d 100644 --- a/frameworks/core/components/test/unittest/svg/BUILD.gn +++ b/frameworks/core/components/test/unittest/svg/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/svg" + module_output_path = "ace_engine/backenduicomponent/svg" } else { module_output_path = "ace_engine_full/backenduicomponent/svg" } @@ -47,13 +47,7 @@ ohos_unittest("RenderSvgTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_svg_test") { diff --git a/frameworks/core/components/test/unittest/swiper/BUILD.gn b/frameworks/core/components/test/unittest/swiper/BUILD.gn index ea8e3237cc1..fe7e27f457b 100644 --- a/frameworks/core/components/test/unittest/swiper/BUILD.gn +++ b/frameworks/core/components/test/unittest/swiper/BUILD.gn @@ -30,13 +30,7 @@ ohos_unittest("SwiperCreatorTest") { "$ace_root/build:ace_ohos_unittest_base", "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -258,13 +252,7 @@ ohos_unittest("SwiperComponentTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_swiper_test") { diff --git a/frameworks/core/components/test/unittest/tabbar/BUILD.gn b/frameworks/core/components/test/unittest/tabbar/BUILD.gn index b05f2357cd7..2f5cf53cf0b 100644 --- a/frameworks/core/components/test/unittest/tabbar/BUILD.gn +++ b/frameworks/core/components/test/unittest/tabbar/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/tabbar" + module_output_path = "ace_engine/backenduicomponent/tabbar" } else { module_output_path = "ace_engine_full/backenduicomponent/tabbar" } @@ -34,13 +34,7 @@ ohos_unittest("RenderTabBarTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("RenderTabContentTest") { @@ -269,13 +263,7 @@ ohos_unittest("RenderTabContentTest") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_tabcontent_test") { @@ -301,13 +289,7 @@ ohos_unittest("TabContentCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -334,13 +316,7 @@ ohos_unittest("TabBarElementTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_tabbar_element_test") { @@ -369,13 +345,7 @@ ohos_unittest("TabBarCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/text/BUILD.gn b/frameworks/core/components/test/unittest/text/BUILD.gn index dfa4a979a74..5bbfef62de2 100644 --- a/frameworks/core/components/test/unittest/text/BUILD.gn +++ b/frameworks/core/components/test/unittest/text/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/text" + module_output_path = "ace_engine/backenduicomponent/text" } else { module_output_path = "ace_engine_full/backenduicomponent/text" } @@ -38,13 +38,7 @@ ohos_unittest("TextCreatorTest") { "$ace_root/build:ace_ohos_unittest_base", "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { diff --git a/frameworks/core/components/test/unittest/text_field/BUILD.gn b/frameworks/core/components/test/unittest/text_field/BUILD.gn index 285bdd1a2e6..60903447d8e 100644 --- a/frameworks/core/components/test/unittest/text_field/BUILD.gn +++ b/frameworks/core/components/test/unittest/text_field/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/textfield" + module_output_path = "ace_engine/backenduicomponent/textfield" } else { module_output_path = "ace_engine_full/backenduicomponent/textfield" } @@ -38,13 +38,7 @@ ohos_unittest("TextFieldCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -71,13 +65,7 @@ ohos_unittest("RenderTextFieldTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_text_field_test") { diff --git a/frameworks/core/components/test/unittest/text_select/BUILD.gn b/frameworks/core/components/test/unittest/text_select/BUILD.gn index 44125ac9a4e..168352c95c2 100644 --- a/frameworks/core/components/test/unittest/text_select/BUILD.gn +++ b/frameworks/core/components/test/unittest/text_select/BUILD.gn @@ -32,13 +32,7 @@ ohos_unittest("RenderTextSelectTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_text_select_test") { diff --git a/frameworks/core/components/test/unittest/theme/BUILD.gn b/frameworks/core/components/test/unittest/theme/BUILD.gn index d6d4230ddd1..3f8918eca3f 100644 --- a/frameworks/core/components/test/unittest/theme/BUILD.gn +++ b/frameworks/core/components/test/unittest/theme/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/theme" + module_output_path = "ace_engine/backenduicomponent/theme" } else { module_output_path = "ace_engine_full/backenduicomponent/theme" } @@ -103,7 +103,7 @@ ohos_unittest("ThemeManagerTest") { ] } else { subsystem_name = "arkui" - part_name = "ace_engine_standard" + part_name = ace_engine_part sources += [ "$ace_root/frameworks/base/geometry/animatable_dimension.cpp", "$ace_root/frameworks/base/log/dump_log.cpp", @@ -213,13 +213,7 @@ ohos_unittest("ThemeConstantsTest") { "$ace_root/adapter/ohos/osal/log_wrapper.cpp", "$ace_root/frameworks/core/mock/mock_resource_adapter.cpp", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_theme_manager_test") { diff --git a/frameworks/core/components/test/unittest/transform/BUILD.gn b/frameworks/core/components/test/unittest/transform/BUILD.gn index c7c63f89032..2682067b0b6 100644 --- a/frameworks/core/components/test/unittest/transform/BUILD.gn +++ b/frameworks/core/components/test/unittest/transform/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/transform" + module_output_path = "ace_engine/backenduicomponent/transform" } else { module_output_path = "ace_engine_full/backenduicomponent/transform" } @@ -35,13 +35,7 @@ ohos_unittest("TransformCreatorTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -64,13 +58,7 @@ ohos_unittest("RenderTransformTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/transition/BUILD.gn b/frameworks/core/components/test/unittest/transition/BUILD.gn index 57f328eccc9..069c50c46bb 100644 --- a/frameworks/core/components/test/unittest/transition/BUILD.gn +++ b/frameworks/core/components/test/unittest/transition/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/frameworkbasicability/transition" + module_output_path = "ace_engine/frameworkbasicability/transition" } else { module_output_path = "ace_engine_full/frameworkbasicability/transition" } @@ -257,13 +257,7 @@ ohos_unittest("TransitionElementTest") { "$ace_root/adapter/ohos/osal/log_wrapper.cpp", "$ace_root/frameworks/core/mock/mock_resource_adapter.cpp", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("SharedTransitionElementTest") { @@ -370,7 +364,7 @@ ohos_unittest("TransitionPropertyElementTest") { ] configs += [ "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara_config" ] subsystem_name = "arkui" - part_name = "ace_engine_standard" + part_name = ace_engine_part } else { external_deps = [ "hilog:libhilog", diff --git a/frameworks/core/components/test/unittest/tween/BUILD.gn b/frameworks/core/components/test/unittest/tween/BUILD.gn index 65b12b67c8c..f2bd329118a 100644 --- a/frameworks/core/components/test/unittest/tween/BUILD.gn +++ b/frameworks/core/components/test/unittest/tween/BUILD.gn @@ -225,13 +225,7 @@ ohos_unittest("TweenElementTest") { } else { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_tween_element_test") { diff --git a/frameworks/core/components/test/unittest/video/BUILD.gn b/frameworks/core/components/test/unittest/video/BUILD.gn index 28c784f3017..ab669c8cc26 100644 --- a/frameworks/core/components/test/unittest/video/BUILD.gn +++ b/frameworks/core/components/test/unittest/video/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/video" + module_output_path = "ace_engine/backenduicomponent/video" } else { module_output_path = "ace_engine_full/backenduicomponent/video" } @@ -34,13 +34,7 @@ ohos_unittest("VideoCreatorTest") { "$ace_root/build:ace_ohos_unittest_base", "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_json_creator_test") { @@ -63,13 +57,7 @@ ohos_unittest("RenderTextureTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/components/test/unittest/view_update/BUILD.gn b/frameworks/core/components/test/unittest/view_update/BUILD.gn index ecaae1cf988..dfc58992476 100644 --- a/frameworks/core/components/test/unittest/view_update/BUILD.gn +++ b/frameworks/core/components/test/unittest/view_update/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/graphicalbasicability/viewupdate" + module_output_path = "ace_engine/graphicalbasicability/viewupdate" } else { module_output_path = "ace_engine_full/graphicalbasicability/viewupdate" } @@ -35,13 +35,7 @@ ohos_unittest("ViewUpdateTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_view_update_test") { diff --git a/frameworks/core/components/test/unittest/water_flow/BUILD.gn b/frameworks/core/components/test/unittest/water_flow/BUILD.gn index dbf1e054c50..363f9bae5cf 100644 --- a/frameworks/core/components/test/unittest/water_flow/BUILD.gn +++ b/frameworks/core/components/test/unittest/water_flow/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/water_flow" + module_output_path = "ace_engine/backenduicomponent/water_flow" } else { module_output_path = "ace_engine_full/backenduicomponent/water_flow" } diff --git a/frameworks/core/components/test/unittest/wrap/BUILD.gn b/frameworks/core/components/test/unittest/wrap/BUILD.gn index edd92516e71..cd01818fa86 100644 --- a/frameworks/core/components/test/unittest/wrap/BUILD.gn +++ b/frameworks/core/components/test/unittest/wrap/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/backenduicomponent/wrap" + module_output_path = "ace_engine/backenduicomponent/wrap" } else { module_output_path = "ace_engine_full/backenduicomponent/wrap" } @@ -37,13 +37,7 @@ ohos_unittest("RenderWrapTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_render_wrap_test") { diff --git a/frameworks/core/event/test/unittest/BUILD.gn b/frameworks/core/event/test/unittest/BUILD.gn index 26a91f3ab8e..001aec2874a 100644 --- a/frameworks/core/event/test/unittest/BUILD.gn +++ b/frameworks/core/event/test/unittest/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/graphicalbasicability/event" + module_output_path = "ace_engine/graphicalbasicability/event" } else { module_output_path = "ace_engine_full/graphicalbasicability/event" } @@ -32,13 +32,7 @@ ohos_unittest("EventsTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } ohos_unittest("MultimodalTest") { @@ -53,13 +47,7 @@ ohos_unittest("MultimodalTest") { "$ace_root/frameworks/core/components/test:json", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/focus/test/unittest/focus/BUILD.gn b/frameworks/core/focus/test/unittest/focus/BUILD.gn index b27077142a9..2335e6fe368 100644 --- a/frameworks/core/focus/test/unittest/focus/BUILD.gn +++ b/frameworks/core/focus/test/unittest/focus/BUILD.gn @@ -89,13 +89,7 @@ ohos_unittest("FocusTest") { external_deps = [ "hilog:libhilog" ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/gestures/test/unittest/BUILD.gn b/frameworks/core/gestures/test/unittest/BUILD.gn index e7b300ab32a..f4fbafe7c92 100644 --- a/frameworks/core/gestures/test/unittest/BUILD.gn +++ b/frameworks/core/gestures/test/unittest/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/graphicalbasicability/gestures" + module_output_path = "ace_engine/graphicalbasicability/gestures" } else { module_output_path = "ace_engine_full/graphicalbasicability/gestures" } @@ -29,13 +29,7 @@ ohos_unittest("GesturesTest") { deps = [ "$ace_root/build:ace_ohos_unittest_base" ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/frameworks/core/image/test/unittest/BUILD.gn b/frameworks/core/image/test/unittest/BUILD.gn index 1c9b9d52945..a358fce01e8 100644 --- a/frameworks/core/image/test/unittest/BUILD.gn +++ b/frameworks/core/image/test/unittest/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (is_standard_system) { - module_output_path = "ace_engine_standard/graphicalbasicability/image" + module_output_path = "ace_engine/graphicalbasicability/image" } else { module_output_path = "ace_engine_full/graphicalbasicability/image" } @@ -82,13 +82,7 @@ ohos_unittest("ImageCacheTest") { "//utils/native/base:utils", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_image_cache_test") { @@ -165,13 +159,7 @@ ohos_unittest("ImageProviderTest") { "//utils/native/base:utils", ] - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } config("config_image_provider_test") { diff --git a/frameworks/core/pipeline/test/unittest/context/BUILD.gn b/frameworks/core/pipeline/test/unittest/context/BUILD.gn index 91a5cd9fb59..cac974c2258 100644 --- a/frameworks/core/pipeline/test/unittest/context/BUILD.gn +++ b/frameworks/core/pipeline/test/unittest/context/BUILD.gn @@ -235,13 +235,7 @@ ohos_unittest("PipelineContextTest") { ] } - if (!is_standard_system) { - subsystem_name = "arkui" - part_name = "ace_engine_full" - } else { - subsystem_name = "arkui" - part_name = "ace_engine_standard" - } + part_name = ace_engine_part } group("unittest") { diff --git a/interfaces/inner_api/ui_service_manager/BUILD.gn b/interfaces/inner_api/ui_service_manager/BUILD.gn index 2f9a887a3ce..24474c4a36c 100755 --- a/interfaces/inner_api/ui_service_manager/BUILD.gn +++ b/interfaces/inner_api/ui_service_manager/BUILD.gn @@ -13,6 +13,7 @@ import("//build/ohos.gni") import("//foundation/ability/ability_runtime/aafwk.gni") +import("//foundation/arkui/ace_engine/ace_config.gni") config("uiservice_manager_public_config") { visibility = [ ":*" ] @@ -77,5 +78,5 @@ ohos_shared_library("ui_service_mgr") { ] subsystem_name = "arkui" - part_name = "ace_engine_standard" + part_name = ace_engine_part }