IssueNo:#I4RL1L

Description:部件化新增taskDispatcher依赖 Sig:SIG_ApplicationFramework Feature or Bugfix: Feature Binary Source: No Signed-off-by: dy_study <dingyao5@huawei.com> Change-Id: Idb0247738fbcbcfee4ecdfda8fddb866a775a115
2024-12-02 20:47:11 +00:00 · 2022-02-08 07:13:57 +00:00 · 2022-02-08 07:13:57 +00:00 · 086edc30e9
commit 086edc30e9
parent f3c3e7fe44
8 changed files with 30 additions and 36 deletions
--- a/bundle.json
+++ b/bundle.json
@ -185,12 +185,12 @@
                "header_base": "//foundation/aafwk/standard/common/task_dispatcher/include",
                "header_files": [
                  "dispatcher/parallel_task_dispatcher.h",
-                  "dispatcher/task_dispatcher_context",
+                  "dispatcher/task_dispatcher_context.h",
                  "threading/runnable.h",
                  "task/task.h"
                ]
              },
-              "name": "//foundation/aafwk/standard/common:common_target"
+              "name": "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher"
            }
          ],
          "test": [
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@ -15,5 +15,5 @@ import("//build/ohos.gni")
 import("//foundation/aafwk/standard/aafwk.gni")

 group("common_target") {
-  deps = [ "task_dispatcher:appkit_dispatcher_td" ]
+  deps = [ "task_dispatcher:task_dispatcher" ]
 }
--- a/common/task_dispatcher/BUILD.gn
+++ b/common/task_dispatcher/BUILD.gn
@ -13,15 +13,8 @@

 import("//build/ohos.gni")
 import("//foundation/aafwk/standard/aafwk.gni")
-config("appkit_config") {
-  config("appkit_public_config") {
-    visibility = [ ":*" ]
-    include_dirs = []
-  }
-  include_dirs = []
-}

-ohos_shared_library("appkit_dispatcher_td") {
+config("task_dispatcher_public_config") {
  include_dirs = [
    "${appexecfwk_path}/common/log/include",
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
@ -32,10 +25,10 @@ ohos_shared_library("appkit_dispatcher_td") {
    "${aafwk_path}/frameworks/kits/appkit/native/app/include/task",
    "${aafwk_path}/frameworks/kits/appkit/native/app/include",
  ]
+}

-  configs = [ ":appkit_config" ]
-
-  public_configs = [ ":appkit_public_config" ]
+ohos_shared_library("task_dispatcher") {
+  public_configs = [ ":task_dispatcher_public_config" ]

  sources = [
    "${aafwk_path}/common/task_dispatcher/src/dispatcher/base_task_dispatcher.cpp",
@ -66,5 +59,6 @@ ohos_shared_library("appkit_dispatcher_td") {
  ]
  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]

+  subsystem_name = "aafwk"
  part_name = "ability_runtime"
 }
--- a/frameworks/kits/ability/native/BUILD.gn
+++ b/frameworks/kits/ability/native/BUILD.gn
@ -231,7 +231,7 @@ ohos_shared_library("abilitykit_native") {
    "${INNERKITS_PATH}/base:base",
    "${INNERKITS_PATH}/want:want",
    "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
--- a/frameworks/kits/ability/native/test/BUILD.gn
+++ b/frameworks/kits/ability/native/test/BUILD.gn
@ -105,7 +105,7 @@ ohos_unittest("ability_test") {
    "${INNERKITS_PATH}/base:base",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
@ -209,7 +209,7 @@ ohos_unittest("ability_context_for_task_dispacher_test") {
  deps = [
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
@ -480,7 +480,7 @@ ohos_unittest("ability_impl_active_test") {
  deps = [
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
@ -518,7 +518,7 @@ ohos_unittest("ability_impl_test") {
    "${INNERKITS_PATH}/want:want",
    "//base/global/i18n_standard/frameworks/intl:intl_util",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
@ -569,7 +569,7 @@ ohos_unittest("ability_thread_test") {
  deps = [
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
@ -660,7 +660,7 @@ ohos_unittest("data_ability_impl_test") {
    "${INNERKITS_PATH}/base:base",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
@ -708,7 +708,7 @@ ohos_unittest("data_ability_impl_file_secondpart_test") {
    "${INNERKITS_PATH}/base:base",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
@ -756,7 +756,7 @@ ohos_unittest("data_ability_impl_file_test") {
    "${INNERKITS_PATH}/base:base",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
@ -805,7 +805,7 @@ ohos_unittest("ability_thread_dataability_test") {
  deps = [
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
@ -1018,7 +1018,7 @@ ohos_unittest("form_host_client_test") {
  deps = [
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
@ -1060,7 +1060,7 @@ ohos_unittest("continuation_test") {
  deps = [
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
--- a/frameworks/kits/appkit/BUILD.gn
+++ b/frameworks/kits/appkit/BUILD.gn
@ -148,7 +148,7 @@ ohos_shared_library("appkit_native") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  deps = [
-    "${aafwk_path}/common/task_dispatcher:appkit_dispatcher_td",
+    "${aafwk_path}/common/task_dispatcher:task_dispatcher",
    "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native",
    "${aafwk_path}/frameworks/kits/appkit:app_context",
    "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
@ -218,7 +218,7 @@ ohos_shared_library("app_context") {
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core",

    # "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native",
-    "${aafwk_path}/common/task_dispatcher:appkit_dispatcher_td",
+    "${aafwk_path}/common/task_dispatcher:task_dispatcher",
    "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler",
    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
--- a/frameworks/kits/appkit/native/test/BUILD.gn
+++ b/frameworks/kits/appkit/native/test/BUILD.gn
@ -124,7 +124,7 @@ ohos_unittest("application_test") {
    "${ABILITY_INNERKITS_PATH}/want:want",
    "${aafwk_path}/frameworks/kits/appkit:app_context",
    "${aafwk_path}/frameworks/kits/appkit:appkit_native",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
@ -164,7 +164,7 @@ ohos_unittest("context_container_test") {
  deps = [
    "${ABILITY_INNERKITS_PATH}/want:want",
    "${aafwk_path}/frameworks/kits/appkit:appkit_native",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
@ -191,7 +191,7 @@ ohos_unittest("application_context_for_task_dispacher_test") {
  deps = [
    "${ABILITY_INNERKITS_PATH}/want:want",
    "${aafwk_path}/frameworks/kits/appkit:appkit_native",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
@ -217,7 +217,7 @@ ohos_unittest("context_deal_for_task_dispacher_test") {
  deps = [
    "${ABILITY_INNERKITS_PATH}/want:want",
    "${aafwk_path}/frameworks/kits/appkit:appkit_native",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
@ -251,7 +251,7 @@ ohos_unittest("context_deal_test") {
  deps = [
    "${ABILITY_INNERKITS_PATH}/want:want",
    "${aafwk_path}/frameworks/kits/appkit:appkit_native",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
@ -285,7 +285,7 @@ ohos_unittest("application_impl_test") {
  deps = [
    "${ABILITY_INNERKITS_PATH}/want:want",
    "${aafwk_path}/frameworks/kits/appkit:appkit_native",
-    "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td",
+    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
--- a/ohos.build
+++ b/ohos.build
@ -138,12 +138,12 @@
            "header_base": "//foundation/aafwk/standard/common/task_dispatcher/include",
            "header_files": [
              "dispatcher/parallel_task_dispatcher.h",
-              "dispatcher/task_dispatcher_context",
+              "dispatcher/task_dispatcher_context.h",
              "threading/runnable.h",
              "task/task.h"
            ]
          },
-          "name": "//foundation/aafwk/standard/common:common_target"
+          "name": "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher"
        }
      ],
      "test_list": [