From 3902bae0a53b02cc52a4be71c829eed58e8aa5fb Mon Sep 17 00:00:00 2001 From: xuzheheng Date: Mon, 4 Jul 2022 16:16:52 +0800 Subject: [PATCH 1/2] xuzheheng1@huawei.com Signed-off-by: xuzheheng Change-Id: I49c69920c54ac95435cdb75338bccaff16812c8e --- frameworks/ans/BUILD.gn | 2 +- tools.patch | 26 ++++++++++++++++++++++++++ tools/dump/BUILD.gn | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 tools.patch diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index e17745f8b..1ad35aa79 100644 --- a/frameworks/ans/BUILD.gn +++ b/frameworks/ans/BUILD.gn @@ -30,7 +30,7 @@ config("ans_innerkits_public_config") { "//utils/system/safwk/native/include", ] configs = [ - "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", + "${ability_runtime_inner_api_path}/wantagent:wantagent_innerkits_public_config", "//foundation/multimedia/image_standard/interfaces/innerkits:image_external_config", ] } diff --git a/tools.patch b/tools.patch new file mode 100644 index 000000000..d595c4f82 --- /dev/null +++ b/tools.patch @@ -0,0 +1,26 @@ +diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn +index e17745f..1ad35aa 100644 +--- a/frameworks/ans/BUILD.gn ++++ b/frameworks/ans/BUILD.gn +@@ -30,7 +30,7 @@ config("ans_innerkits_public_config") { + "//utils/system/safwk/native/include", + ] + configs = [ +- "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", ++ "${ability_runtime_inner_api_path}/wantagent:wantagent_innerkits_public_config", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_external_config", + ] + } +diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn +index 12d5e76..dd68bfa 100644 +--- a/tools/dump/BUILD.gn ++++ b/tools/dump/BUILD.gn +@@ -39,7 +39,7 @@ ohos_executable("anm") { + + configs = [ + "${core_path}:public_ans_core_config", +- "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", ++ "${ability_runtime_inner_api_path}/wantagent:wantagent_innerkits_public_config", + ] + + defines = [] diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn index 12d5e7603..dd68bfafe 100644 --- a/tools/dump/BUILD.gn +++ b/tools/dump/BUILD.gn @@ -39,7 +39,7 @@ ohos_executable("anm") { configs = [ "${core_path}:public_ans_core_config", - "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", + "${ability_runtime_inner_api_path}/wantagent:wantagent_innerkits_public_config", ] defines = [] -- Gitee From a96842ec657614c43f6126a6c2249a0456c58f94 Mon Sep 17 00:00:00 2001 From: savior-xzh Date: Tue, 5 Jul 2022 03:05:48 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20tool?= =?UTF-8?q?s.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 tools.patch diff --git a/tools.patch b/tools.patch deleted file mode 100644 index d595c4f82..000000000 --- a/tools.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn -index e17745f..1ad35aa 100644 ---- a/frameworks/ans/BUILD.gn -+++ b/frameworks/ans/BUILD.gn -@@ -30,7 +30,7 @@ config("ans_innerkits_public_config") { - "//utils/system/safwk/native/include", - ] - configs = [ -- "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", -+ "${ability_runtime_inner_api_path}/wantagent:wantagent_innerkits_public_config", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_external_config", - ] - } -diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn -index 12d5e76..dd68bfa 100644 ---- a/tools/dump/BUILD.gn -+++ b/tools/dump/BUILD.gn -@@ -39,7 +39,7 @@ ohos_executable("anm") { - - configs = [ - "${core_path}:public_ans_core_config", -- "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", -+ "${ability_runtime_inner_api_path}/wantagent:wantagent_innerkits_public_config", - ] - - defines = [] -- Gitee