From 749c6e8211f81775dd071283791331c215bf4194 Mon Sep 17 00:00:00 2001 From: duzhihao Date: Fri, 12 Jan 2024 15:02:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Decription:=20=E8=A7=A3=E5=86=B3=E8=93=9D?= =?UTF-8?q?=E5=8C=BA=E5=A4=A9=E7=BD=91=E7=BC=96=E8=AF=91=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E4=B8=8D=E8=B6=B3=E7=9A=84=E9=97=AE=E9=A2=98=20IssueNo:=20http?= =?UTF-8?q?s://gitee.com/openharmony/build/issues/I8VNHR=3Ffrom=3Dproject-?= =?UTF-8?q?issue=20Feature=20or=20Bugfix:=20Feature=20Binary=20Source:=20N?= =?UTF-8?q?o=20Signed-off-by:=20duzhihao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ohos/images/BUILD.gn | 18 ++++++++++++++---- .../mkimage/asan/debug/userdata_image_conf.txt | 5 +++++ .../mkimage/asan/userdata_image_conf.txt | 6 ++++++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 ohos/images/mkimage/asan/debug/userdata_image_conf.txt create mode 100644 ohos/images/mkimage/asan/userdata_image_conf.txt diff --git a/ohos/images/BUILD.gn b/ohos/images/BUILD.gn index 8ff3ccfc80..e3fcf27373 100644 --- a/ohos/images/BUILD.gn +++ b/ohos/images/BUILD.gn @@ -192,6 +192,8 @@ build_image_tools_path = [ "//build/ohos/images/mkimage", ] +base_dir = "//build/ohos/images/mkimage" + foreach(_platform, target_platform_list) { current_platform = _platform current_platform_dir = "${product_output_dir}/$current_platform" @@ -202,9 +204,9 @@ foreach(_platform, target_platform_list) { image_list = [ "system", "vendor", - "userdata", "sys_prod", "chip_prod", + "userdata", "updater_ramdisk", "eng_system", "eng_chipset", @@ -258,11 +260,15 @@ foreach(_platform, target_platform_list) { } } + if (is_asan && _image_name == "userdata") { + base_dir = "${base_dir}/asan" + } + image_config_file = - "//build/ohos/images/mkimage/${_image_name}_image_conf.txt" + "${base_dir}/${_image_name}_image_conf.txt" if (is_debug) { image_config_file = - "//build/ohos/images/mkimage/debug/${_image_name}_image_conf.txt" + "${base_dir}/debug/${_image_name}_image_conf.txt" } device_image_config_file = "${product_output_dir}/imagesconf/${_image_name}_image_conf.txt" @@ -320,8 +326,12 @@ foreach(_platform, target_platform_list) { depfile = "$target_gen_dir/$target_name.d" deps = [ "//build/ohos/packages:${_platform}_install_modules" ] + if (is_asan && _image_name == "userdata") { + base_dir = "${base_dir}/asan" + } + image_config_file = - "//build/ohos/images/mkimage/${_image_name}_image_conf.txt" + "${base_dir}/${_image_name}_image_conf.txt" device_image_config_file = "${product_output_dir}/imagesconf/${_image_name}_image_conf.txt" image_input_path = "${current_platform_dir}/${_image_name}/${_product}" diff --git a/ohos/images/mkimage/asan/debug/userdata_image_conf.txt b/ohos/images/mkimage/asan/debug/userdata_image_conf.txt new file mode 100644 index 0000000000..fa054bab20 --- /dev/null +++ b/ohos/images/mkimage/asan/debug/userdata_image_conf.txt @@ -0,0 +1,5 @@ +/data +4404019200 +--fs_type=f2fs +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux_adapter/file_contexts.bin diff --git a/ohos/images/mkimage/asan/userdata_image_conf.txt b/ohos/images/mkimage/asan/userdata_image_conf.txt new file mode 100644 index 0000000000..d3e42cd05f --- /dev/null +++ b/ohos/images/mkimage/asan/userdata_image_conf.txt @@ -0,0 +1,6 @@ +/data +4404019200 +--fs_type=f2fs +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux_adapter/file_contexts.bin +--prjquota \ No newline at end of file -- Gitee From 7561eef30705e8a5802c1e84a9c203a73acbf5dd Mon Sep 17 00:00:00 2001 From: duzhihao Date: Fri, 12 Jan 2024 15:02:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Decription:=20=E8=A7=A3=E5=86=B3=E8=93=9D?= =?UTF-8?q?=E5=8C=BA=E5=A4=A9=E7=BD=91=E7=BC=96=E8=AF=91=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E4=B8=8D=E8=B6=B3=E7=9A=84=E9=97=AE=E9=A2=98=20IssueNo:=20http?= =?UTF-8?q?s://gitee.com/openharmony/build/issues/I8VNHR=3Ffrom=3Dproject-?= =?UTF-8?q?issue=20Feature=20or=20Bugfix:=20Feature=20Binary=20Source:=20N?= =?UTF-8?q?o=20Signed-off-by:=20duzhihao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ohos/images/BUILD.gn | 16 ++++++++++++---- .../mkimage/asan/debug/userdata_image_conf.txt | 5 +++++ ohos/images/mkimage/asan/userdata_image_conf.txt | 6 ++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 ohos/images/mkimage/asan/debug/userdata_image_conf.txt create mode 100644 ohos/images/mkimage/asan/userdata_image_conf.txt diff --git a/ohos/images/BUILD.gn b/ohos/images/BUILD.gn index 8ff3ccfc80..b951b21185 100644 --- a/ohos/images/BUILD.gn +++ b/ohos/images/BUILD.gn @@ -192,6 +192,8 @@ build_image_tools_path = [ "//build/ohos/images/mkimage", ] +base_dir = "//build/ohos/images/mkimage" + foreach(_platform, target_platform_list) { current_platform = _platform current_platform_dir = "${product_output_dir}/$current_platform" @@ -257,12 +259,14 @@ foreach(_platform, target_platform_list) { deps += [ "//build/ohos/packages:check_seccomp_filter_name" ] } } - + if (is_asan && _image_name == "userdata") { + base_dir = "${base_dir}/asan" + } image_config_file = - "//build/ohos/images/mkimage/${_image_name}_image_conf.txt" + "${base_dir}/${_image_name}_image_conf.txt" if (is_debug) { image_config_file = - "//build/ohos/images/mkimage/debug/${_image_name}_image_conf.txt" + "${base_dir}/debug/${_image_name}_image_conf.txt" } device_image_config_file = "${product_output_dir}/imagesconf/${_image_name}_image_conf.txt" @@ -320,8 +324,12 @@ foreach(_platform, target_platform_list) { depfile = "$target_gen_dir/$target_name.d" deps = [ "//build/ohos/packages:${_platform}_install_modules" ] + if (is_asan && _image_name == "userdata") { + base_dir = "${base_dir}/asan" + } + image_config_file = - "//build/ohos/images/mkimage/${_image_name}_image_conf.txt" + "${base_dir}/${_image_name}_image_conf.txt" device_image_config_file = "${product_output_dir}/imagesconf/${_image_name}_image_conf.txt" image_input_path = "${current_platform_dir}/${_image_name}/${_product}" diff --git a/ohos/images/mkimage/asan/debug/userdata_image_conf.txt b/ohos/images/mkimage/asan/debug/userdata_image_conf.txt new file mode 100644 index 0000000000..fa054bab20 --- /dev/null +++ b/ohos/images/mkimage/asan/debug/userdata_image_conf.txt @@ -0,0 +1,5 @@ +/data +4404019200 +--fs_type=f2fs +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux_adapter/file_contexts.bin diff --git a/ohos/images/mkimage/asan/userdata_image_conf.txt b/ohos/images/mkimage/asan/userdata_image_conf.txt new file mode 100644 index 0000000000..d3e42cd05f --- /dev/null +++ b/ohos/images/mkimage/asan/userdata_image_conf.txt @@ -0,0 +1,6 @@ +/data +4404019200 +--fs_type=f2fs +--dac_config ../../build/ohos/images/mkimage/dac.txt +--file_context obj/base/security/selinux_adapter/file_contexts.bin +--prjquota \ No newline at end of file -- Gitee