!280 ability_base目录整改及周边子系统依赖标准化

Merge pull request !280 from dy/master
This commit is contained in:
openharmony_ci
2022-05-17 11:39:46 +00:00
committed by Gitee
17 changed files with 4 additions and 33 deletions
-2
View File
@@ -21,8 +21,6 @@ config("kits_natvie_config") {
include_dirs = [
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include/",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/aafwk/standard/services/abilitymgr/include/",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/distributedschedule/safwk/services/safwk/include",
@@ -29,8 +29,6 @@ ohos_moduletest("cesModuleTest") {
include_dirs = [
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/aafwk/standard/services/abilitymgr/include/",
"//foundation/aafwk/standard/services/common/include",
"//foundation/communication/ipc/ipc/dnetwork_temp",
@@ -29,8 +29,6 @@ ohos_moduletest("CesPublishOrderedEventModuleTest") {
include_dirs = [
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/aafwk/standard/services/abilitymgr/include/",
"//foundation/aafwk/standard/services/common/include",
"//foundation/communication/ipc/ipc/dnetwork_temp",
@@ -22,9 +22,9 @@
#include "application_info.h"
#include "bundle_mgr_host.h"
#include "bundle_mgr_interface.h"
#include "ohos/aafwk/content/want.h"
#include "iremote_proxy.h"
#include "iremote_stub.h"
#include "want.h"
namespace OHOS {
namespace AppExecFwk {
+1 -1
View File
@@ -22,9 +22,9 @@
#include "application_info.h"
#include "bundle_mgr_host.h"
#include "bundle_mgr_interface.h"
#include "ohos/aafwk/content/want.h"
#include "iremote_proxy.h"
#include "iremote_stub.h"
#include "want.h"
namespace OHOS {
namespace AppExecFwk {
-3
View File
@@ -19,11 +19,8 @@ config("cesfwk_kits_test_config") {
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//utils/system/safwk/native/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base",
"${services_path}/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/distributedschedule/safwk/services/safwk/include",
]
}
@@ -25,7 +25,6 @@ ohos_systemtest("ActsCESCESpublishInfoTest") {
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"${services_path}/include",
"${common_event_service_path}/test/systemtest/common/resource",
"//third_party/json/single_include",
@@ -23,10 +23,7 @@ ohos_systemtest("ActsCESDateTest") {
configs = [ "${common_event_service_path}/test/systemtest/common/ces:cesfwk_kits_test_config" ]
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
]
include_dirs = [ "//utils/native/base/include" ]
cflags = []
@@ -26,8 +26,6 @@ ohos_systemtest("ActsCESManagertest") {
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"${common_event_service_path}/test/systemtest/common/resource",
"//third_party/json/single_include",
]
@@ -26,7 +26,6 @@ ohos_systemtest("ActsCESMatchingSkillsTest") {
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"${common_event_service_path}/test/systemtest/common/resource",
"//third_party/json/single_include",
]
@@ -26,7 +26,6 @@ ohos_systemtest("ActsCESSubscribeInfoTest") {
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"${common_event_service_path}/test/systemtest/common/resource",
"//third_party/json/single_include",
]
@@ -30,14 +30,11 @@ ohos_systemtest("ActsFuzzTest") {
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"${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/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/aafwk/standard/frameworks/kits/ability/native/include",
"//foundation/aafwk/standard/services/abilitymgr/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
@@ -57,7 +54,6 @@ ohos_systemtest("ActsFuzzTest") {
"//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/interfaces/innerkits/base:base",
"//foundation/aafwk/standard/services/abilitymgr:abilityms",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
-3
View File
@@ -19,10 +19,7 @@ config("cesfwk_kits_test_config") {
include_dirs = [
"//utils/native/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//utils/system/safwk/native/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/distributedschedule/safwk/services/safwk/include",
]
}
@@ -26,8 +26,6 @@ ohos_systemtest("cesCheckService") {
include_dirs = [
"//utils/native/base/include",
"${services_path}/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
]
cflags = []
@@ -26,7 +26,6 @@ ohos_systemtest("CESPublishOrderedEventSystmTest") {
include_dirs = [
"//utils/native/base/include",
"${services_path}/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/aafwk/standard/services/abilitymgr/include/",
]
@@ -26,8 +26,6 @@ ohos_systemtest("cesSystemTest") {
include_dirs = [
"//utils/native/base/include",
"${services_path}/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
]
cflags = []
@@ -52,7 +52,7 @@
// aafwk/bundle
#include "bundle_mgr_proxy.h"
#include "ohos/aafwk/base/short_wrapper.h"
#include "short_wrapper.h"
#include "../include/getparam.h"
#include "../include/fuzzTestManager.h"