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 5bd53e466f413ca57db07663b74547d43cffd9ca..2f7b842f4698255a0f919fa06790327872ef8520 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 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 e89d6bbedfc093dfec51132d5812a10ff6c7e831..a1de1a801a88c832364650548070a04d7efbe66f 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 43be1a246e1a1ae56b73e738da516fd71176fc1f..aa290c7a27fddc38e596f455bef72d91a7a63fb9 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 c5406009810bfd8de80ed4357f7ff9d06a0f5658..8b6ee3900bbcd99f571f8d739022ec3a228a4852 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 647c01f1ed940e0c93223669405ced7b1242be8e..103c727e2f6eb8b80964e054b03af99350471b46 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