mirror of
https://github.com/openharmony/aafwk_aafwk_lite.git
synced 2026-07-01 20:34:43 -04:00
Merge branch 'master' of gitee.com:openharmony/aafwk_aafwk_lite into master
Signed-off-by: zhouliting <zhouliting5@huawei.com>
This commit is contained in:
@@ -35,7 +35,7 @@ lite_library("ability") {
|
||||
public_deps = [
|
||||
"${aafwk_lite_path}/frameworks/abilitymgr_lite:abilitymanager",
|
||||
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static",
|
||||
"//utils/native/lite/kv_store:kv_store",
|
||||
"//foundation/distributeddatamgr/appdatamgr/frameworks/native/kv_store:kv_store",
|
||||
]
|
||||
|
||||
defines = []
|
||||
@@ -71,6 +71,7 @@ lite_library("ability") {
|
||||
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
|
||||
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
|
||||
"//utils/native/lite/kv_store:kv_store",
|
||||
"//foundation/distributeddatamgr/appdatamgr/frameworks/native/kv_store:kv_store",
|
||||
]
|
||||
|
||||
defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ]
|
||||
@@ -100,12 +101,11 @@ lite_library("ability") {
|
||||
"//foundation/graphic/ui/frameworks",
|
||||
"//foundation/graphic/surface/interfaces/kits",
|
||||
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
|
||||
"//foundation/distributeddatamgr/appdatamgr/frameworks/native/kv_store/innerkits",
|
||||
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
|
||||
"//foundation/communication/ipc/interfaces/innerkits/c/ipc/include",
|
||||
"//foundation/communication/ipc/ipc/native/c/manager/include",
|
||||
"//third_party/bounds_checking_function/include",
|
||||
"//third_party/freetype/include",
|
||||
"//utils/native/lite/kv_store/innerkits",
|
||||
"//utils/native/lite/include",
|
||||
"./include",
|
||||
"./",
|
||||
|
||||
@@ -27,7 +27,7 @@ lite_library("abilitymanager") {
|
||||
deps = [
|
||||
"${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
|
||||
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static",
|
||||
"//foundation/ace/ace_engine_lite/frameworks:ace_lite",
|
||||
"//foundation/arkui/ace_engine_lite/frameworks:ace_lite",
|
||||
]
|
||||
} else {
|
||||
target_type = "shared_library"
|
||||
@@ -67,9 +67,9 @@ lite_library("abilitymanager") {
|
||||
"${appexecfwk_lite_path}/frameworks/bundle_lite/include",
|
||||
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
|
||||
"//foundation/communication/ipc/interfaces/innerkits/c/ipc/include",
|
||||
"//foundation/distributeddatamgr/appdatamgr/frameworks/native/kv_store/innerkits",
|
||||
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
|
||||
"//third_party/bounds_checking_function/include",
|
||||
"//utils/native/lite/kv_store/innerkits",
|
||||
"//utils/native/lite/include",
|
||||
"//utils/native/lite/memory/include",
|
||||
"./include",
|
||||
|
||||
@@ -16,7 +16,7 @@ import("//build/ohos.gni")
|
||||
ohos_shared_library("aafwk") {
|
||||
include_dirs = [
|
||||
"//third_party/node/src",
|
||||
"//foundation/ace/napi/interfaces/kits",
|
||||
"//foundation/arkui/napi/interfaces/kits",
|
||||
]
|
||||
|
||||
cflags = [
|
||||
@@ -28,7 +28,7 @@ ohos_shared_library("aafwk") {
|
||||
|
||||
deps = [
|
||||
"//foundation/aafwk/aafwk_lite/frameworks/abilitymgr_lite:abilitymanager",
|
||||
"//foundation/ace/napi/:ace_napi",
|
||||
"//foundation/arkui/napi/:ace_napi",
|
||||
"//utils/native/base:utils",
|
||||
]
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ lite_library("abilityms") {
|
||||
|
||||
deps = [
|
||||
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static",
|
||||
"//foundation/ace/ace_engine_lite/frameworks:ace_lite",
|
||||
"//foundation/arkui/ace_engine_lite/frameworks:ace_lite",
|
||||
"//foundation/distributedschedule/samgr_lite/samgr:samgr",
|
||||
]
|
||||
} else {
|
||||
|
||||
@@ -46,8 +46,8 @@ executable("aa") {
|
||||
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
|
||||
"//build/lite/config/component/cJSON:cjson_shared",
|
||||
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
|
||||
"//foundation/distributeddatamgr/appdatamgr/frameworks/native/kv_store:kv_store",
|
||||
"//foundation/distributedschedule/samgr_lite/samgr:samgr",
|
||||
"//utils/native/lite/kv_store:kv_store",
|
||||
]
|
||||
|
||||
if (enable_ohos_appexecfwk_feature_ability == true) {
|
||||
|
||||
Reference in New Issue
Block a user