diff --git a/build/templates/cxx/cxx.gni b/build/templates/cxx/cxx.gni
index 5b22340cb83089750ca5ef9164ecf85ed4ca73f8..1ad1978667105a90f0c4cf5310e158c59d656146 100755
--- a/build/templates/cxx/cxx.gni
+++ b/build/templates/cxx/cxx.gni
@@ -106,6 +106,34 @@ template("ohos_shared_library") {
                              "use_exceptions",
                              "external_deps",
                            ])
+    if (defined(invoker.subsystem_name) && defined(invoker.part_name)) {
+      subsystem_name = invoker.subsystem_name
+      part_name = invoker.part_name
+    } else if (defined(invoker.part_name)) {
+      part_name = invoker.part_name
+      _part_subsystem_info_file =
+          "$root_build_dir/build_configs/parts_info/part_subsystem.json"
+      _arguments = [
+        "--part-name",
+        part_name,
+        "--part-subsystem-info-file",
+        rebase_path(_part_subsystem_info_file, root_build_dir),
+      ]
+      get_subsystem_script = "//build/templates/common/get_subsystem_name.py"
+      subsystem_name =
+          exec_script(get_subsystem_script, _arguments, "trim string")
+    } else if (defined(invoker.subsystem_name)) {
+      subsystem_name = invoker.subsystem_name
+      part_name = subsystem_name
+    } else {
+      subsystem_name = "common"
+      part_name = subsystem_name
+    }
+    if (is_standard_system) {
+      output_dir = "${root_out_dir}/${subsystem_name}/${part_name}"
+    } else {
+      output_dir = "${root_out_dir}"
+    }
   }
 }
 
diff --git a/build/third_party_gn/icu/icu4c/BUILD.gn b/build/third_party_gn/icu/icu4c/BUILD.gn
index bbb96422bedd9d4a3a888fbb46c127db2fad4a7d..b9ee62157d466ea7f6da2a1bc30acf9cade0db5b 100644
--- a/build/third_party_gn/icu/icu4c/BUILD.gn
+++ b/build/third_party_gn/icu/icu4c/BUILD.gn
@@ -46,13 +46,6 @@ ohos_static_library("static_icustubdata") {
   output_name = "stubdata"
 }
 
-# ohos_prebuilt_etc("ohos_icudat") {
-#   source = "//third_party/icu/ohos_icu4j/data/icudt69l.dat"
-#   module_install_dir = "usr/ohos_icu/"
-#   part_name = "icu"
-#   subsystem_name = "thirdparty"
-# }
-
 icu_common_source = [
   "//third_party/icu/icu4c/source/common/ubiditransform.cpp",
   "//third_party/icu/icu4c/source/common/locutil.cpp",