From b0f63e695fb2f49d6681aa2b7933d286b3296660 Mon Sep 17 00:00:00 2001
From: shiqichang <shiqichang@huawei.com>
Date: Sat, 28 May 2022 15:51:18 +0800
Subject: [PATCH] =?UTF-8?q?aafwk=E7=9B=AE=E5=BD=95=E5=88=87=E6=8D=A2abilit?=
 =?UTF-8?q?y=5Fability=5Fruntime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: shiqichang <shiqichang@huawei.com>
Change-Id: I6739f7fe1909575c0cce532f81e5a2cd78e58805
---
 frameworks/js/napi/BUILD.gn              | 12 ++++--------
 frameworks/js/napi/src/reminder/BUILD.gn |  4 ++--
 notification.gni                         |  9 +++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn
index dc967b11..bbfe9afd 100644
--- a/frameworks/js/napi/BUILD.gn
+++ b/frameworks/js/napi/BUILD.gn
@@ -15,15 +15,11 @@ import("//base/notification/distributed_notification_service/notification.gni")
 import("//build/ohos.gni")
 
 group("napi_reminder") {
-  deps = [
-    "src/reminder:reminderagent",
-  ]
+  deps = [ "src/reminder:reminderagent" ]
 }
 
 group("napi_notification") {
-  deps = [
-    ":notification",
-  ]
+  deps = [ ":notification" ]
 }
 
 cflags = []
@@ -46,7 +42,7 @@ config("native_module_config") {
 ohos_shared_library("notification") {
   include_dirs = [
     "${aafwk_kits_path}/ability/native/include",
-    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common",
+    "//foundation/ability/ability_runtime/interfaces/kits/napi/aafwk/inner/napi_common",
     "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/",
     "include",
     "//third_party/node/src",
@@ -78,7 +74,7 @@ ohos_shared_library("notification") {
   deps = [
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
-    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
+    "//foundation/ability/ability_runtime/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image",
     "//third_party/jsoncpp:jsoncpp",
     "//third_party/libuv:uv_static",
diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn
index 76fe8a95..eb2b27f8 100644
--- a/frameworks/js/napi/src/reminder/BUILD.gn
+++ b/frameworks/js/napi/src/reminder/BUILD.gn
@@ -34,7 +34,7 @@ config("native_module_config") {
 ohos_shared_library("reminderagent") {
   include_dirs = [
     "${aafwk_kits_path}/ability/native/include",
-    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common",
+    "//foundation/ability/ability_runtime/interfaces/kits/napi/aafwk/inner/napi_common",
     "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/",
     "../../include",
     "//third_party/node/src",
@@ -55,7 +55,7 @@ ohos_shared_library("reminderagent") {
   deps = [
     "${core_path}:ans_core",
     "${frameworks_module_ans_path}:ans_innerkits",
-    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
+    "//foundation/ability/ability_runtime/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image",
     "//third_party/jsoncpp:jsoncpp",
     "//third_party/libuv:uv_static",
diff --git a/notification.gni b/notification.gni
index aa18e772..a6d07bf5 100644
--- a/notification.gni
+++ b/notification.gni
@@ -11,9 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-aafwk_inner_api_path = "//foundation/aafwk/standard/interfaces/innerkits"
-aafwk_services_path = "//foundation/aafwk/standard/services"
-aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits"
+aafwk_inner_api_path =
+    "//foundation/ability/ability_runtime/interfaces/innerkits"
+aafwk_services_path = "//foundation/ability/ability_runtime/services"
+aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits"
 component_name = "distributed_notification_service"
 component_path = "//base/notification/distributed_notification_service"
 services_path = "${component_path}/services"
@@ -24,7 +25,7 @@ inner_api_path = "${interfaces_path}/inner_api"
 core_path = "${frameworks_path}/core"
 test_path = "${component_path}/test"
 tools_path = "${component_path}/tools"
-aafwk_path = "//foundation/aafwk/standard"
+aafwk_path = "//foundation/ability/ability_runtime"
 distributed_notification_supported = true
 subsystem_name = "notification"
 component_external_deps = [