From a2e5ef61331898850356c6c65179f25672354660 Mon Sep 17 00:00:00 2001
From: shiqichang <shiqichang@huawei.com>
Date: Fri, 17 Jun 2022 17:19:32 +0800
Subject: [PATCH] =?UTF-8?q?aafwk=E7=9B=AE=E5=BD=95=E8=BD=AC=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: shiqichang <shiqichang@huawei.com>
Change-Id: Ia9570bc8d89f5937496bb9188c63924560c3e4b8
---
 frameworks/js/napi/BUILD.gn                        | 3 ++-
 frameworks/js/napi/src/reminder/BUILD.gn           | 2 +-
 frameworks/test/moduletest/BUILD.gn                | 2 +-
 test/common/acts/actsnotificationfuzztest/BUILD.gn | 4 ++--
 test/resource/ansSTSlotGroupTest/BUILD.gn          | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn
index e32c8e41c..0d9a851e8 100644
--- a/frameworks/js/napi/BUILD.gn
+++ b/frameworks/js/napi/BUILD.gn
@@ -41,7 +41,7 @@ config("native_module_config") {
 
 ohos_shared_library("notification") {
   include_dirs = [
-    "${aafwk_kits_path}/ability/native/include",
+    "${aafwk_path}/interfaces/kits/native/ability/native",
     "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common",
     "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/",
     "include",
@@ -72,6 +72,7 @@ ohos_shared_library("notification") {
   ]
 
   deps = [
+    "${aafwk_path}/frameworks/native/appkit:app_context",
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
     "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common:napi_common",
diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn
index 3370adb72..91b4bde2e 100644
--- a/frameworks/js/napi/src/reminder/BUILD.gn
+++ b/frameworks/js/napi/src/reminder/BUILD.gn
@@ -33,7 +33,7 @@ config("native_module_config") {
 
 ohos_shared_library("reminderagent") {
   include_dirs = [
-    "${aafwk_kits_path}/ability/native/include",
+    "${aafwk_path}/interfaces/kits/native/ability/native",
     "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common",
     "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/",
     "../../include",
diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn
index 5f73269a6..c1e6b76ba 100644
--- a/frameworks/test/moduletest/BUILD.gn
+++ b/frameworks/test/moduletest/BUILD.gn
@@ -139,7 +139,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") {
   configs = [ "//utils/native/base:utils_config" ]
 
   deps = [
-    "${aafwk_kits_path}/appkit:app_context",
+    "${aafwk_path}/frameworks/native/appkit:app_context",
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn
index 370249f4e..29e8b9568 100644
--- a/test/common/acts/actsnotificationfuzztest/BUILD.gn
+++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn
@@ -31,7 +31,7 @@ ohos_systemtest("ActsNotificationFuzzTest") {
 
   include_dirs = [
     "${aafwk_inner_api_path}/ability_manager/include",
-    "${aafwk_kits_path}/ability/native/include",
+    "${aafwk_path}/interfaces/kits/native/ability/native",
     "${aafwk_kits_path}/app/native/app/include/task",
     "${aafwk_services_path}/abilitymgr/include",
     "${core_path}/include",
@@ -49,7 +49,7 @@ ohos_systemtest("ActsNotificationFuzzTest") {
   }
 
   deps = [
-    "${aafwk_kits_path}/appkit:appkit_native",
+    "${aafwk_path}/frameworks/native/appkit:appkit_native",
     "${aafwk_services_path}/abilitymgr:abilityms",
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn
index 7013b63d4..81e3c378f 100644
--- a/test/resource/ansSTSlotGroupTest/BUILD.gn
+++ b/test/resource/ansSTSlotGroupTest/BUILD.gn
@@ -26,7 +26,7 @@ config("ansSTSlotGroupTestConfig") {
 
   include_dirs = [
     "${SUBDEMOSYSTEM_DIR}/include",
-    "${aafwk_kits_path}/appkit/native/app",
+    "${aafwk_path}/interfaces/kits/native/appkit/app",
     "${aafwk_services_path}/abilitymgr/include",
     "${inner_api_path}",
   ]
@@ -43,7 +43,7 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") {
   configs = [ ":ansSTSlotGroupTestConfig" ]
 
   deps = [
-    "${aafwk_kits_path}/appkit:appkit_native",
+    "${aafwk_path}/frameworks/native/appkit:appkit_native",
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
     "//utils/native/base:utilsbase",
-- 
Gitee