aafwk绝对路径整改

Signed-off-by: shiqichang <shiqichang@huawei.com>
Change-Id: I1ea71ec385489b50e4e761ff136e55fbd4b215fd

event.gni

@@ -13,6 +13,12 @@
 
 aafwk_path = "//foundation/aafwk/standard"
 
+aafwk_inner_api_path = "//foundation/aafwk/standard/interfaces/innerkits"
+
+aafwk_services_path = "//foundation/aafwk/standard/services"
+
+aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits"
+
 common_event_service_path = "//base/notification/common_event_service"
 
 frameworks_path = "${common_event_service_path}/frameworks"

frameworks/native/test/unittest/BUILD.gn

@@ -20,8 +20,8 @@ config("kits_natvie_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
-    "//foundation/aafwk/standard/services/abilitymgr/include/",
+    "${aafwk_inner_api_path}/ability_manager/include",
+    "${aafwk_services_path}/abilitymgr/include/",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
     "//foundation/distributedschedule/safwk/services/safwk/include",
     "//utils/native/base/include",
@@ -65,11 +65,11 @@ ohos_unittest("common_event_subscribe_test") {
   configs = [ ":kits_natvie_config" ]
 
   deps = [
+    "${aafwk_services_path}/abilitymgr:abilityms",
     "${ces_common_path}:libevent_common",
     "${ces_core_path}:cesfwk_core",
     "${ces_native_path}:cesfwk_innerkits",
     "${services_path}:cesfwk_services",
-    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
   ]
@@ -92,10 +92,10 @@ ohos_unittest("common_event_unsubscribe_test") {
   configs = [ ":kits_natvie_config" ]
 
   deps = [
+    "${aafwk_services_path}/abilitymgr:abilityms",
     "${ces_core_path}:cesfwk_core",
     "${ces_native_path}:cesfwk_innerkits",
     "${services_path}:cesfwk_services",
-    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
   ]

services/BUILD.gn

@@ -70,10 +70,10 @@ ohos_shared_library("cesfwk_services") {
 
   deps = [
     ":static_subscriber_config.json",
+    "${aafwk_kits_path}/ability/native:static_subscriber_ipc",
     "${ces_common_path}:libevent_common",
     "${ces_core_path}:cesfwk_core",
     "${ces_native_path}:cesfwk_innerkits",
-    "//foundation/aafwk/standard/frameworks/kits/ability/native:static_subscriber_ipc",
     "//utils/native/base:utils",
   ]
 

services/test/moduletest/common_event_services_module_test/BUILD.gn

@@ -28,9 +28,9 @@ ohos_moduletest("cesModuleTest") {
   configs = [ "${common_event_service_path}/test/systemtest/common/ces:cesfwk_kits_test_config" ]
 
   include_dirs = [
-    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
-    "//foundation/aafwk/standard/services/abilitymgr/include/",
-    "//foundation/aafwk/standard/services/common/include",
+    "${aafwk_inner_api_path}/ability_manager/include",
+    "${aafwk_services_path}/abilitymgr/include/",
+    "${aafwk_services_path}/common/include",
     "//foundation/communication/ipc/ipc/dnetwork_temp",
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/app_distributeddata/include",
     "//foundation/distributedschedule/safwk/services/safwk/include",

services/test/moduletest/common_event_services_publish_ordered_module_test/BUILD.gn

@@ -28,9 +28,9 @@ ohos_moduletest("CesPublishOrderedEventModuleTest") {
   configs = [ "${common_event_service_path}/test/systemtest/common/ces:cesfwk_kits_test_config" ]
 
   include_dirs = [
-    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
-    "//foundation/aafwk/standard/services/abilitymgr/include/",
-    "//foundation/aafwk/standard/services/common/include",
+    "${aafwk_inner_api_path}/ability_manager/include",
+    "${aafwk_services_path}/abilitymgr/include/",
+    "${aafwk_services_path}/common/include",
     "//foundation/communication/ipc/ipc/dnetwork_temp",
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/app_distributeddata/include",
     "//foundation/distributedschedule/safwk/services/safwk/include",

test/systemtest/common/acts/actsCESDataTest/BUILD.gn

@@ -32,11 +32,11 @@ ohos_systemtest("ActsCESDateTest") {
   }
 
   deps = [
+    "${aafwk_services_path}/abilitymgr:abilityms",
     "${ces_common_path}:libevent_common",
     "${ces_core_path}:cesfwk_core",
     "${ces_native_path}:cesfwk_innerkits",
     "${services_path}:cesfwk_services",
-    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
   ]

test/systemtest/common/acts/actsfuzztest/BUILD.gn

@@ -33,10 +33,10 @@ ohos_systemtest("ActsFuzzTest") {
     "${common_event_service_path}/test/systemtest/common/resource",
     "//third_party/json/single_include",
     "${services_path}/include",
-    "//foundation/aafwk/standard/frameworks/kits/appkit/app/include",
-    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
-    "//foundation/aafwk/standard/frameworks/kits/ability/native/include",
-    "//foundation/aafwk/standard/services/abilitymgr/include",
+    "${aafwk_kits_path}/appkit/app/include",
+    "${aafwk_inner_api_path}/ability_manager/include",
+    "${aafwk_kits_path}/ability/native/include",
+    "${aafwk_services_path}/abilitymgr/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
   ]
@@ -48,13 +48,13 @@ ohos_systemtest("ActsFuzzTest") {
   }
 
   deps = [
+    "${aafwk_inner_api_path}/ability_manager:ability_manager",
+    "${aafwk_inner_api_path}/app_manager:app_manager",
+    "${aafwk_kits_path}/ability/native:abilitykit_native",
+    "${aafwk_kits_path}/appkit:appkit_native",
+    "${aafwk_services_path}/abilitymgr:abilityms",
     "${ces_common_path}:libevent_common",
     "${ces_native_path}:cesfwk_innerkits",
-    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
-    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
-    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
-    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
-    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
   ]

test/systemtest/common/ces/common_event_services_publish_ordered_system_test/BUILD.gn

@@ -26,7 +26,7 @@ ohos_systemtest("CESPublishOrderedEventSystmTest") {
   include_dirs = [
     "//utils/native/base/include",
     "${services_path}/include",
-    "//foundation/aafwk/standard/services/abilitymgr/include/",
+    "${aafwk_services_path}/abilitymgr/include/",
   ]
 
   cflags = []