From b270143d3ca29e0c398124229ecf896fb3d109e6 Mon Sep 17 00:00:00 2001 From: maximum2974 Date: Wed, 3 Sep 2025 14:18:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: maximum2974 --- .../appPackagerHapTest/BUILD.gn | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHapTest/BUILD.gn b/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHapTest/BUILD.gn index 5bd53e46..2f7b842f 100644 --- a/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHapTest/BUILD.gn +++ b/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHapTest/BUILD.gn @@ -13,29 +13,21 @@ import("//build/ohos.gni") -ohos_hap("appPackagerHapTest") { - hap_profile = "entry/src/main/module.json" +ohos_app("appPackagerHapTest") { hap_name = "appPackagerHapTest" - final_hap_path = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_app/${hap_name}.hap" - testonly = true + subsystem_name = "developtools" + part_name = "packing_tool" + hap_out_dir = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_app" + certificate_profile = "../app_packager_file/com.test.apppackagertest.p7b" + + sdk_home = "//prebuilts/ohos-sdk/linux" + sdk_type_name = [ "sdk.dir" ] + + assemble_type = "assembleHap" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] - certificate_profile = "../app_packager_file/com.test.apppackagertest.p7b" -} - -ohos_app_scope("bmsstagedemoone_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "entry/src/main/ets" -} -ohos_resources("hjs_demo_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":bmsstagedemoone_app_profile" ] - hap_profile = "entry/src/main/module.json" -} + js_build_mode = "release" +} \ No newline at end of file -- Gitee From 9c1384db99183b3784cce1fc44ac5e7ef1a3fbca Mon Sep 17 00:00:00 2001 From: maximum2974 Date: Fri, 19 Sep 2025 16:03:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: maximum2974 --- .../appPackagerHspTest/BUILD.gn | 32 +++++++------------ .../hspTestFile/BUILD.gn | 32 +++++++------------ .../multiappPackagerHapTest/BUILD.gn | 32 +++++++------------ .../multiappPackagerHspTest/BUILD.gn | 32 +++++++------------ 4 files changed, 48 insertions(+), 80 deletions(-) diff --git a/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHspTest/BUILD.gn b/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHspTest/BUILD.gn index e89d6bbe..a1de1a80 100644 --- a/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHspTest/BUILD.gn +++ b/packing_tool/frameworks/test/unittest/app_packager_test/appPackagerHspTest/BUILD.gn @@ -13,29 +13,21 @@ import("//build/ohos.gni") -ohos_hap("appPackagerHspTest") { - hap_profile = "entry/src/main/module.json" +ohos_app("appPackagerHspTest") { hap_name = "appPackagerHspTest" - final_hap_path = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_app/${hap_name}.hsp" - testonly = true + subsystem_name = "developtools" + part_name = "packing_tool" + hap_out_dir = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_app" + certificate_profile = "../app_packager_file/com.test.apppackagertest.p7b" + + sdk_home = "//prebuilts/ohos-sdk/linux" + sdk_type_name = [ "sdk.dir" ] + + assemble_type = "assembleHap" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] - certificate_profile = "../app_packager_file/com.test.apppackagertest.p7b" -} - -ohos_app_scope("bmsstagedemoone_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "entry/src/main/ets" -} -ohos_resources("hjs_demo_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":bmsstagedemoone_app_profile" ] - hap_profile = "entry/src/main/module.json" -} + js_build_mode = "release" +} \ No newline at end of file diff --git a/packing_tool/frameworks/test/unittest/fast_app_packager_test/hspTestFile/BUILD.gn b/packing_tool/frameworks/test/unittest/fast_app_packager_test/hspTestFile/BUILD.gn index 43be1a24..aa290c7a 100644 --- a/packing_tool/frameworks/test/unittest/fast_app_packager_test/hspTestFile/BUILD.gn +++ b/packing_tool/frameworks/test/unittest/fast_app_packager_test/hspTestFile/BUILD.gn @@ -13,29 +13,21 @@ import("//build/ohos.gni") -ohos_hap("fastAppPackagerHspTest") { - hap_profile = "library/src/main/module.json" +ohos_app("fastAppPackagerHspTest") { hap_name = "fastAppPackagerHspTest" - final_hap_path = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/fast_app_packager_file/${hap_name}.hsp" - testonly = true + subsystem_name = "developtools" + part_name = "packing_tool" + hap_out_dir = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/fast_app_packager_file" + certificate_profile = "./com.test.packingtooldemo.p7b" + + sdk_home = "//prebuilts/ohos-sdk/linux" + sdk_type_name = [ "sdk.dir" ] + + assemble_type = "assembleHap" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] - certificate_profile = "./com.test.packingtooldemo.p7b" -} - -ohos_app_scope("bmsstagedemoone_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "library/src/main/ets" -} -ohos_resources("hjs_demo_resources") { - sources = [ "library/src/main/resources" ] - deps = [ ":bmsstagedemoone_app_profile" ] - hap_profile = "library/src/main/module.json" -} + js_build_mode = "release" +} \ No newline at end of file diff --git a/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHapTest/BUILD.gn b/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHapTest/BUILD.gn index c5406009..8b6ee390 100644 --- a/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHapTest/BUILD.gn +++ b/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHapTest/BUILD.gn @@ -13,29 +13,21 @@ import("//build/ohos.gni") -ohos_hap("multiappPackagerHapTest") { - hap_profile = "entry/src/main/module.json" +ohos_app("multiappPackagerHapTest") { hap_name = "multiappPackagerHapTest" - final_hap_path = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_multiapp/${hap_name}.hap" - testonly = true + subsystem_name = "developtools" + part_name = "packing_tool" + hap_out_dir = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_multiapp" + certificate_profile = "../multiapp_packager_file/com.test.apppackagertest.p7b" + + sdk_home = "//prebuilts/ohos-sdk/linux" + sdk_type_name = [ "sdk.dir" ] + + assemble_type = "assembleHap" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] - certificate_profile = "../multiapp_packager_file/com.test.apppackagertest.p7b" -} - -ohos_app_scope("bmsstagedemoone_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "entry/src/main/ets" -} -ohos_resources("hjs_demo_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":bmsstagedemoone_app_profile" ] - hap_profile = "entry/src/main/module.json" -} + js_build_mode = "release" +} \ No newline at end of file diff --git a/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHspTest/BUILD.gn b/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHspTest/BUILD.gn index 647c01f1..103c727e 100644 --- a/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHspTest/BUILD.gn +++ b/packing_tool/frameworks/test/unittest/multiapp_packager_test/multiappPackagerHspTest/BUILD.gn @@ -13,29 +13,21 @@ import("//build/ohos.gni") -ohos_hap("multiappPackagerHspTest") { - hap_profile = "entry/src/main/module.json" +ohos_app("multiappPackagerHspTest") { hap_name = "multiappPackagerHspTest" - final_hap_path = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_multiapp/${hap_name}.hsp" - testonly = true + susbsystem_name = "developtools" + part_name = "packing_tool" + hap_out_dir = "$root_out_dir/tests/unittest/packing_tool/packing_tool/test_file/test_bundle_multiapp" + certificate_profile = "../multiapp_packager_file/com.test.apppackagertest.p7b" + + sdk_home = "//prebuilts/ohos-sdk/linux" + sdk_type_name = [ "sdk.dir" ] + + assemble_type = "assembleHap" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] - certificate_profile = "../multiapp_packager_file/com.test.apppackagertest.p7b" -} - -ohos_app_scope("bmsstagedemoone_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "entry/src/main/ets" -} -ohos_resources("hjs_demo_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":bmsstagedemoone_app_profile" ] - hap_profile = "entry/src/main/module.json" -} + js_build_mode = "release" +} \ No newline at end of file -- Gitee