!157 merge deps_external into master

编译告警修改 外部依赖从deps修改为external_deps

Created-by: xwx1135370
Commit-by: xwx1135370
Merged-by: openharmony_ci
Description: ### 相关的Issue
https://gitcode.com/openharmony/commonlibrary_utils_lite/issues/96
  
### 原因(目的、解决的问题等)
utils_lite中存在部分依赖外部部件模块的处理使用的是deps而非external_deps
js/builtin/simulator目录下的模块仅ide预览模块调用,预览模块只会编译到sdk中

ohos_static_library必须添加subsystem_name 和 part_name 参数,否则会默认成  subsystem_name = "build",part_name = "build_framework",一旦依赖外部部件,则需要在build仓的bundle.json中添加依赖部件名

### 描述(做了什么,变更了什么)
修改 外部依赖从deps修改为external_deps


### 测试用例(新增、改动、可能影响的功能)
 ![image.png](https://raw.gitcode.com/user-images/assets/4431817/1db82049-9094-4eb5-b0f6-014af63080b8/image.png 'image.png')
    
### 是否已执行L0用例
- [ ] 已验证
- [ ] 不涉及。如不涉及,请写明理由


See merge request: openharmony/commonlibrary_utils_lite!157
This commit is contained in:
openharmony_ci
2025-10-17 09:24:29 +08:00
5 changed files with 111 additions and 89 deletions
+4 -5
View File
@@ -27,10 +27,7 @@
"small"
],
"deps": {
"thrid_party": [
"bounds_checking_function",
"musl"
],
"third_party": [],
"kernel_special": {},
"board_special": {},
"components": [
@@ -39,7 +36,9 @@
"graphic_utils_lite",
"resource_management_lite",
"ui_lite",
"ace_engine_lite"
"ace_engine_lite",
"bounds_checking_function",
"musl"
]
},
"build": {
+1 -2
View File
@@ -29,7 +29,6 @@ lite_library("ace_kit_deviceinfo") {
include_dirs = [
"include",
"../common/include",
"//base/startup/init/interfaces/innerkits/include/syspara",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async",
@@ -38,5 +37,5 @@ lite_library("ace_kit_deviceinfo") {
"//foundation/graphic/graphic_utils_lite/interfaces/kits",
"//base/global/resource_management_lite/interfaces/inner_api/include",
]
deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
external_deps = [ "init:libbegetutil" ]
}
+1 -2
View File
@@ -30,11 +30,10 @@ lite_library("ace_kit_file") {
include_dirs = [
"include",
"../common/include",
"//third_party/bounds_checking_function/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async",
"${aafwk_lite_path}/interfaces/kits/ability_lite",
]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
}
+1 -2
View File
@@ -30,11 +30,10 @@ lite_library("ace_kit_kvstore") {
include_dirs = [
"include",
"../common/include",
"//third_party/bounds_checking_function/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async",
"${aafwk_lite_path}/interfaces/kits/ability_lite",
]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
}
+104 -78
View File
@@ -16,87 +16,113 @@
import("//build/lite/config/subsystem/aafwk/path.gni")
import("//build/ohos.gni")
ohos_static_library("ace_kit_common_simulator") {
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/common/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/common/src/nativeapi_common.cpp",
]
}
if (build_ohos_sdk) {
ohos_static_library("ace_kit_common_simulator") {
visibility = [
":*",
"//ide/tools/previewer/mock/*",
]
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/common/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/common/src/nativeapi_common.cpp",
]
subsystem_name = "commonlibrary"
part_name = "utils_lite"
}
ohos_static_library("ace_kit_deviceinfo_simulator") {
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/deviceinfokit/include",
"//commonlibrary/utils_lite/js/builtin/common/include",
"//base/startup/init/interfaces/innerkits/include/syspara",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"//base/global/resource_management_lite/interfaces/inner_api/include",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp",
"//commonlibrary/utils_lite/js/builtin/deviceinfokit/src/nativeapi_ohos_deviceinfo.cpp",
]
deps = [
"//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite",
"//foundation/arkui/ui_lite/ext/ide:ui_ide",
]
}
ohos_static_library("ace_kit_deviceinfo_simulator") {
visibility = [
":*",
"//ide/tools/previewer/mock/*",
]
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/deviceinfokit/include",
"//commonlibrary/utils_lite/js/builtin/common/include",
"//base/startup/init/interfaces/innerkits/include/syspara",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"//base/global/resource_management_lite/interfaces/inner_api/include",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp",
"//commonlibrary/utils_lite/js/builtin/deviceinfokit/src/nativeapi_ohos_deviceinfo.cpp",
]
external_deps = [
"ace_engine_lite:ace_lite",
"ui_lite:ui_ide",
]
subsystem_name = "commonlibrary"
part_name = "utils_lite"
}
config("storage_config") {
cflags = [
"-D_INC_STDIO_S",
"-D_INC_STDLIB_S",
"-D_INC_MEMORY_S",
"-D_INC_STRING_S",
"-D_INC_WCHAR_S",
"-D_SECTMP=//",
"-D_STDIO_S_DEFINED",
"-Wno-error",
]
cflags_cc = cflags
}
config("storage_config") {
cflags = [
"-D_INC_STDIO_S",
"-D_INC_STDLIB_S",
"-D_INC_MEMORY_S",
"-D_INC_STRING_S",
"-D_INC_WCHAR_S",
"-D_SECTMP=//",
"-D_STDIO_S_DEFINED",
"-Wno-error",
]
cflags_cc = cflags
}
config("aafwk_config") {
include_dirs = [ "${aafwk_lite_path}/interfaces/kits/ability_lite" ]
}
config("aafwk_config") {
include_dirs = [ "${aafwk_lite_path}/interfaces/kits/ability_lite" ]
}
ohos_static_library("ace_kit_file_simulator") {
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/filekit/include",
"//commonlibrary/utils_lite/js/builtin/common/include",
"//third_party/bounds_checking_function/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"${aafwk_lite_path}/interfaces/kits/ability_lite",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/filekit/src/nativeapi_fs.cpp",
"//commonlibrary/utils_lite/js/builtin/filekit/src/nativeapi_fs_impl.c",
]
public_configs = [ ":aafwk_config" ]
configs = [ ":storage_config" ]
deps = [
"//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite",
]
}
ohos_static_library("ace_kit_file_simulator") {
visibility = [
":*",
"//ide/tools/previewer/mock/*",
]
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/filekit/include",
"//commonlibrary/utils_lite/js/builtin/common/include",
"//third_party/bounds_checking_function/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"${aafwk_lite_path}/interfaces/kits/ability_lite",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/filekit/src/nativeapi_fs.cpp",
"//commonlibrary/utils_lite/js/builtin/filekit/src/nativeapi_fs_impl.c",
]
public_configs = [ ":aafwk_config" ]
configs = [ ":storage_config" ]
external_deps = [
"ace_engine_lite:ace_lite",
]
subsystem_name = "commonlibrary"
part_name = "utils_lite"
}
ohos_static_library("ace_kit_kvstore_simulator") {
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/kvstorekit/include",
"//commonlibrary/utils_lite/js/builtin/common/include",
"//third_party/bounds_checking_function/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"${aafwk_lite_path}/interfaces/kits/ability_lite",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/kvstorekit/src/nativeapi_kv.cpp",
"//commonlibrary/utils_lite/js/builtin/kvstorekit/src/nativeapi_kv_impl.c",
]
public_configs = [ ":aafwk_config" ]
configs = [ ":storage_config" ]
deps = [
"//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite",
]
ohos_static_library("ace_kit_kvstore_simulator") {
visibility = [
":*",
"//ide/tools/previewer/mock/*",
]
include_dirs = [
"//commonlibrary/utils_lite/js/builtin/kvstorekit/include",
"//commonlibrary/utils_lite/js/builtin/common/include",
"//third_party/bounds_checking_function/include",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin",
"${aafwk_lite_path}/interfaces/kits/ability_lite",
]
sources = [
"//commonlibrary/utils_lite/js/builtin/kvstorekit/src/nativeapi_kv.cpp",
"//commonlibrary/utils_lite/js/builtin/kvstorekit/src/nativeapi_kv_impl.c",
]
public_configs = [ ":aafwk_config" ]
configs = [ ":storage_config" ]
external_deps = [
"ace_engine_lite:ace_lite",
]
subsystem_name = "commonlibrary"
part_name = "utils_lite"
}
}