diff --git a/lite/config/test/test.gni b/lite/config/test/test.gni
index 9a374576f97522f871ff141c994c73cec9d5b811..47b7f696e86da4f3f10fe8a96167219c55bed79d 100644
--- a/lite/config/test/test.gni
+++ b/lite/config/test/test.gni
@@ -151,6 +151,13 @@ template("unittest") {
     if (defined(invoker.public_deps)) {
       public_deps = invoker.public_deps
     }
+    if (defined(invoker.external_deps)) {
+      external_deps = invoker.external_deps
+    }
+    if (defined(invoker.public_external_deps)) {
+      public_external_deps = invoker.public_external_deps
+    }
+
     if (defined(invoker.defines)) {
       defines = invoker.defines
     }
@@ -180,52 +187,6 @@ template("unittest") {
         "-pthread",
       ]
     }
-
-    if (defined(invoker.external_deps) && invoker.external_deps != []) {
-      innersdk_dir_name = "sdk/${target_os}-${target_cpu}"
-      innersdk_base_dir = "//${innersdk_dir_name}"
-
-      component_override_map = rebase_path(
-              "${root_build_dir}/build_configs/component_override_map.json")
-      external_deps_script =
-          rebase_path("//build/templates/common/external_deps_handler.py")
-      external_deps_temp_file = "$target_gen_dir/${_part_name}__${target_name}_external_deps_temp.json"
-      arguments = [ "--external-deps" ]
-      arguments += invoker.external_deps
-      arguments += [
-        "--parts-src-flag-file",
-        rebase_path("$root_build_dir/build_configs/parts_src_flag.json",
-                    root_build_dir),
-        "--external-deps-temp-file",
-        rebase_path(external_deps_temp_file, root_build_dir),
-        "--sdk-base-dir",
-        rebase_path("${innersdk_base_dir}", root_build_dir),
-        "--sdk-dir-name",
-        "${innersdk_dir_name}",
-        "--current-toolchain",
-        current_toolchain,
-        "--innerkits-adapter-info-file",
-        rebase_path("//build/ohos/inner_kits_adapter.json", root_build_dir),
-        "--component-override-map",
-        component_override_map,
-      ]
-
-      handler_result = exec_script(external_deps_script, arguments, "string")
-      if (handler_result != "") {
-        print(handler_result)
-      }
-
-      external_deps_info = read_file(external_deps_temp_file, "json")
-      if (defined(external_deps_info.deps)) {
-        deps += external_deps_info.deps
-      }
-      if (defined(external_deps_info.libs)) {
-        libs += external_deps_info.libs
-      }
-      if (defined(external_deps_info.include_dirs)) {
-        include_dirs += external_deps_info.include_dirs
-      }
-    }
   }
 }
 
@@ -254,6 +215,12 @@ template("moduletest") {
     if (defined(invoker.ldflags)) {
       ldflags += invoker.ldflags
     }
+    if (defined(invoker.external_deps)) {
+      external_deps = invoker.external_deps
+    }
+    if (defined(invoker.public_external_deps)) {
+      public_external_deps = invoker.public_external_deps
+    }
     if (ohos_build_compiler != "clang") {
       ldflags += [ "-lstdc++" ]
     }
@@ -308,6 +275,13 @@ template("fuzztest") {
     if (defined(invoker.ldflags)) {
       ldflags += invoker.ldflags
     }
+
+    if (defined(invoker.external_deps)) {
+      external_deps = invoker.external_deps
+    }
+    if (defined(invoker.public_external_deps)) {
+      public_external_deps = invoker.public_external_deps
+    }
     if (ohos_build_compiler != "clang") {
       ldflags += [ "-lstdc++" ]
     }
diff --git a/templates/cxx/cxx.gni b/templates/cxx/cxx.gni
index 8751685c9db49a672f0af9e41035995c19ddde4f..d88bc8a6ad7c2ff84234e8b56782961245f07c90 100644
--- a/templates/cxx/cxx.gni
+++ b/templates/cxx/cxx.gni
@@ -227,7 +227,6 @@ template("ohos_executable") {
                              "configs",
                              "remove_configs",
                              "static_link",
-                             "external_deps",
                              "install_images",
                              "module_install_dir",
                              "relative_install_dir",
@@ -360,56 +359,6 @@ template("ohos_executable") {
       ]
     }
 
-    if (defined(invoker.external_deps) && invoker.external_deps != []) {
-      external_deps_temp_file =
-          "$target_gen_dir/${part_name}__${target_name}_external_deps_temp.json"
-      if (!ohos_skip_parse_external_deps) {
-        component_override_map = rebase_path(
-                "${root_build_dir}/build_configs/component_override_map.json")
-        external_deps_script =
-            rebase_path("//build/templates/common/external_deps_handler.py")
-        arguments = [ "--external-deps" ]
-        arguments += invoker.external_deps
-        arguments += [
-          "--parts-src-flag-file",
-          rebase_path(parts_src_flag_file, root_build_dir),
-          "--external-deps-temp-file",
-          rebase_path(external_deps_temp_file, root_build_dir),
-          "--sdk-base-dir",
-          rebase_path("${innersdk_base_dir}", root_build_dir),
-          "--sdk-dir-name",
-          "${innersdk_dir_name}",
-          "--current-toolchain",
-          current_toolchain,
-          "--innerkits-adapter-info-file",
-          rebase_path("//build/ohos/inner_kits_adapter.json", root_build_dir),
-          "--component-override-map",
-          component_override_map,
-        ]
-        if (is_use_sdk) {
-          arguments += [ "--use-sdk" ]
-        }
-        if (is_arkui_x) {
-          arguments += [ "--is-arkui-x" ]
-        }
-        handler_result = exec_script(external_deps_script, arguments, "string")
-        if (handler_result != "") {
-          print(handler_result)
-        }
-      }
-
-      external_deps_info = read_file(external_deps_temp_file, "json")
-      if (defined(external_deps_info.deps)) {
-        deps += external_deps_info.deps
-      }
-      if (defined(external_deps_info.libs)) {
-        libs += external_deps_info.libs
-      }
-      if (defined(external_deps_info.include_dirs)) {
-        include_dirs += external_deps_info.include_dirs
-      }
-    }
-
     # We don't need to change config when "is_debug==true"
     # "enable_debug_components" isn't blank means some components using debug level compilation
     if (defined(is_debug) && !is_debug && enable_debug_components != "") {
@@ -755,7 +704,6 @@ template("ohos_shared_library") {
                              "configs",
                              "remove_configs",
                              "no_default_deps",
-                             "external_deps",
                              "install_images",
                              "module_install_dir",
                              "relative_install_dir",
@@ -1007,56 +955,6 @@ template("ohos_shared_library") {
     if (!defined(include_dirs)) {
       include_dirs = []
     }
-    if (defined(invoker.external_deps) && invoker.external_deps != []) {
-      external_deps_temp_file =
-          "$target_gen_dir/${part_name}__${target_name}_external_deps_temp.json"
-      if (!ohos_skip_parse_external_deps) {
-        component_override_map = rebase_path(
-                "${root_build_dir}/build_configs/component_override_map.json")
-        external_deps_script =
-            rebase_path("//build/templates/common/external_deps_handler.py")
-        arguments = [ "--external-deps" ]
-        arguments += invoker.external_deps
-        arguments += [
-          "--parts-src-flag-file",
-          rebase_path(parts_src_flag_file, root_build_dir),
-          "--external-deps-temp-file",
-          rebase_path(external_deps_temp_file, root_build_dir),
-          "--sdk-base-dir",
-          rebase_path("${innersdk_base_dir}", root_build_dir),
-          "--sdk-dir-name",
-          "${innersdk_dir_name}",
-          "--current-toolchain",
-          current_toolchain,
-          "--innerkits-adapter-info-file",
-          rebase_path("//build/ohos/inner_kits_adapter.json", root_build_dir),
-          "--component-override-map",
-          component_override_map,
-        ]
-        if (is_use_sdk) {
-          arguments += [ "--use-sdk" ]
-        }
-        if (is_arkui_x) {
-          arguments += [ "--is-arkui-x" ]
-        }
-
-        handler_result = exec_script(external_deps_script, arguments, "string")
-        if (handler_result != "") {
-          print(handler_result)
-        }
-      }
-
-      external_deps_info = read_file(external_deps_temp_file, "json")
-      if (defined(external_deps_info.deps)) {
-        deps += external_deps_info.deps
-      }
-      if (defined(external_deps_info.libs)) {
-        libs += external_deps_info.libs
-      }
-      if (defined(external_deps_info.include_dirs)) {
-        include_dirs += external_deps_info.include_dirs
-      }
-    }
 
     install_module_info = {
       module_def = target_label
@@ -1266,7 +1164,6 @@ template("ohos_static_library") {
                              "configs",
                              "remove_configs",
                              "no_default_deps",
-                             "external_deps",
                              "license_file",
                              "license_as_sources",
                              "use_exceptions",
@@ -1360,56 +1257,7 @@ template("ohos_static_library") {
     if (!defined(include_dirs)) {
       include_dirs = []
     }
-    if (defined(invoker.external_deps) && invoker.external_deps != []) {
-      external_deps_temp_file =
-          "$target_gen_dir/${part_name}__${target_name}_external_deps_temp.json"
-      if (!ohos_skip_parse_external_deps) {
-        component_override_map = rebase_path(
-                "${root_build_dir}/build_configs/component_override_map.json")
-        external_deps_script =
-            rebase_path("//build/templates/common/external_deps_handler.py")
-        arguments = [ "--external-deps" ]
-        arguments += invoker.external_deps
-        arguments += [
-          "--parts-src-flag-file",
-          rebase_path(parts_src_flag_file, root_build_dir),
-          "--external-deps-temp-file",
-          rebase_path(external_deps_temp_file, root_build_dir),
-          "--sdk-base-dir",
-          rebase_path("${innersdk_base_dir}", root_build_dir),
-          "--sdk-dir-name",
-          "${innersdk_dir_name}",
-          "--current-toolchain",
-          current_toolchain,
-          "--innerkits-adapter-info-file",
-          rebase_path("//build/ohos/inner_kits_adapter.json", root_build_dir),
-          "--component-override-map",
-          component_override_map,
-        ]
-        if (is_use_sdk) {
-          arguments += [ "--use-sdk" ]
-        }
-        if (is_arkui_x) {
-          arguments += [ "--is-arkui-x" ]
-        }
-
-        handler_result = exec_script(external_deps_script, arguments, "string")
-        if (handler_result != "") {
-          print(handler_result)
-        }
-      }
 
-      external_deps_info = read_file(external_deps_temp_file, "json")
-      if (defined(external_deps_info.deps)) {
-        deps += external_deps_info.deps
-      }
-      if (defined(external_deps_info.libs)) {
-        libs += external_deps_info.libs
-      }
-      if (defined(external_deps_info.include_dirs)) {
-        include_dirs += external_deps_info.include_dirs
-      }
-    }
     if (defined(is_debug) && !is_debug && enable_debug_components != "") {
       foreach(component_name, debug_components) {
         if (part_name == component_name) {
@@ -1560,7 +1408,6 @@ template("ohos_source_set") {
                              "configs",
                              "remove_configs",
                              "no_default_deps",
-                             "external_deps",
                              "license_file",
                              "license_as_sources",
                              "use_exceptions",
@@ -1653,56 +1500,7 @@ template("ohos_source_set") {
     if (!defined(include_dirs)) {
       include_dirs = []
     }
-    if (defined(invoker.external_deps) && invoker.external_deps != []) {
-      external_deps_temp_file =
-          "$target_gen_dir/${part_name}__${target_name}_external_deps_temp.json"
-      if (!ohos_skip_parse_external_deps) {
-        component_override_map = rebase_path(
-                "${root_build_dir}/build_configs/component_override_map.json")
-        external_deps_script =
-            rebase_path("//build/templates/common/external_deps_handler.py")
-        arguments = [ "--external-deps" ]
-        arguments += invoker.external_deps
-        arguments += [
-          "--parts-src-flag-file",
-          rebase_path(parts_src_flag_file, root_build_dir),
-          "--external-deps-temp-file",
-          rebase_path(external_deps_temp_file, root_build_dir),
-          "--sdk-base-dir",
-          rebase_path("${innersdk_base_dir}", root_build_dir),
-          "--sdk-dir-name",
-          "${innersdk_dir_name}",
-          "--current-toolchain",
-          current_toolchain,
-          "--innerkits-adapter-info-file",
-          rebase_path("//build/ohos/inner_kits_adapter.json", root_build_dir),
-          "--component-override-map",
-          component_override_map,
-        ]
-        if (is_use_sdk) {
-          arguments += [ "--use-sdk" ]
-        }
-        if (is_arkui_x) {
-          arguments += [ "--is-arkui-x" ]
-        }
 
-        handler_result = exec_script(external_deps_script, arguments, "string")
-        if (handler_result != "") {
-          print(handler_result)
-        }
-      }
-
-      external_deps_info = read_file(external_deps_temp_file, "json")
-      if (defined(external_deps_info.deps)) {
-        deps += external_deps_info.deps
-      }
-      if (defined(external_deps_info.libs)) {
-        libs += external_deps_info.libs
-      }
-      if (defined(external_deps_info.include_dirs)) {
-        include_dirs += external_deps_info.include_dirs
-      }
-    }
     if (defined(is_debug) && !is_debug && enable_debug_components != "") {
       foreach(component_name, debug_components) {
         if (part_name == component_name) {
diff --git a/templates/rust/ohos_rust_library.gni b/templates/rust/ohos_rust_library.gni
index 2b63858b46fc493a0bbffc276afb3d95a4a0914a..f87de59a2b1967511bd30ee3d1e3369532c19e9d 100644
--- a/templates/rust/ohos_rust_library.gni
+++ b/templates/rust/ohos_rust_library.gni
@@ -175,7 +175,6 @@ template("ohos_rust_library") {
                              "configs",
                              "remove_configs",
                              "no_default_deps",
-                             "external_deps",
                              "install_images",
                              "module_install_dir",
                              "relative_install_dir",
@@ -267,48 +266,6 @@ template("ohos_rust_library") {
     if (!defined(include_dirs)) {
       include_dirs = []
     }
-    if (defined(invoker.external_deps)) {
-      component_override_map = rebase_path(
-              "${root_build_dir}/build_configs/component_override_map.json")
-      external_deps_script =
-          rebase_path("//build/templates/common/external_deps_handler.py")
-      external_deps_temp_file =
-          "$target_gen_dir/${part_name}__${target_name}_external_deps_temp.json"
-      arguments = [ "--external-deps" ]
-      arguments += invoker.external_deps
-      arguments += [
-        "--parts-src-flag-file",
-        rebase_path(parts_src_flag_file, root_build_dir),
-        "--external-deps-temp-file",
-        rebase_path(external_deps_temp_file, root_build_dir),
-        "--sdk-base-dir",
-        rebase_path("${innersdk_base_dir}", root_build_dir),
-        "--sdk-dir-name",
-        "${innersdk_dir_name}",
-        "--current-toolchain",
-        current_toolchain,
-        "--innerkits-adapter-info-file",
-        rebase_path("//build/ohos/inner_kits_adapter.json", root_build_dir),
-        "--component-override-map",
-        component_override_map,
-      ]
-      if (is_use_sdk) {
-        arguments += [ "--use-sdk" ]
-      }
-
-      exec_script(external_deps_script, arguments, "string")
-
-      external_deps_info = read_file(external_deps_temp_file, "json")
-      if (defined(external_deps_info.deps)) {
-        deps += external_deps_info.deps
-      }
-      if (defined(external_deps_info.libs)) {
-        libs += external_deps_info.libs
-      }
-      if (defined(external_deps_info.include_dirs)) {
-        include_dirs += external_deps_info.include_dirs
-      }
-    }
 
     install_module_info = {
       module_def = target_label