From a581e07bc9b994d52176b320f89f9164ed447446 Mon Sep 17 00:00:00 2001 From: xwx1135370 Date: Thu, 9 Oct 2025 08:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=91=8A=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E5=A4=96=E9=83=A8=E4=BE=9D=E8=B5=96=E4=BB=8Edeps?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAexternal=5Fdeps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit issue:https://gitcode.com/openharmony/commonlibrary_utils_lite/issues/96 Signed-off-by: xwx1135370 --- bundle.json | 9 +- js/builtin/deviceinfokit/BUILD.gn | 3 +- js/builtin/filekit/BUILD.gn | 3 +- js/builtin/kvstorekit/BUILD.gn | 3 +- js/builtin/simulator/BUILD.gn | 182 +++++++++++++++++------------- 5 files changed, 111 insertions(+), 89 deletions(-) diff --git a/bundle.json b/bundle.json index bc65482..f078851 100644 --- a/bundle.json +++ b/bundle.json @@ -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": { diff --git a/js/builtin/deviceinfokit/BUILD.gn b/js/builtin/deviceinfokit/BUILD.gn index dc7d7ee..b3bc2c5 100644 --- a/js/builtin/deviceinfokit/BUILD.gn +++ b/js/builtin/deviceinfokit/BUILD.gn @@ -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" ] } diff --git a/js/builtin/filekit/BUILD.gn b/js/builtin/filekit/BUILD.gn index 32e40d2..9bbe7d3 100644 --- a/js/builtin/filekit/BUILD.gn +++ b/js/builtin/filekit/BUILD.gn @@ -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" ] } diff --git a/js/builtin/kvstorekit/BUILD.gn b/js/builtin/kvstorekit/BUILD.gn index ce462bc..3b3f540 100644 --- a/js/builtin/kvstorekit/BUILD.gn +++ b/js/builtin/kvstorekit/BUILD.gn @@ -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" ] } diff --git a/js/builtin/simulator/BUILD.gn b/js/builtin/simulator/BUILD.gn index 85975de..52a84f8 100644 --- a/js/builtin/simulator/BUILD.gn +++ b/js/builtin/simulator/BUILD.gn @@ -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" + } }