From fe1c7ceddc7453a2be8e6dc655b5be6a43d478b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E5=90=91=E5=AE=8751?= Date: Fri, 5 Sep 2025 03:21:37 +0000 Subject: [PATCH 1/2] update js/builtin/simulator/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 仲向宇51 --- js/builtin/simulator/BUILD.gn | 179 +++++++++++++++++----------------- 1 file changed, 92 insertions(+), 87 deletions(-) diff --git a/js/builtin/simulator/BUILD.gn b/js/builtin/simulator/BUILD.gn index 85975de..95eaa31 100644 --- a/js/builtin/simulator/BUILD.gn +++ b/js/builtin/simulator/BUILD.gn @@ -13,90 +13,95 @@ # limitations under the License. # -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", - ] -} - -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", - ] -} - -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" ] -} - -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_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", - ] -} +if (os_level != "standard") { + 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", + ] + } + + 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", + ] + } + + 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" ] + } + + 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_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", + ] + } +} else { + group("ace_kit_common_simulator"){ + } +} \ No newline at end of file -- Gitee From de7ec4bac40b9a6c0ee2df0f5e23b6e96824514f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E5=90=91=E5=AE=8751?= Date: Fri, 5 Sep 2025 07:06:00 +0000 Subject: [PATCH 2/2] update js/builtin/simulator/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 仲向宇51 --- js/builtin/simulator/BUILD.gn | 181 +++++++++++++++++----------------- 1 file changed, 89 insertions(+), 92 deletions(-) diff --git a/js/builtin/simulator/BUILD.gn b/js/builtin/simulator/BUILD.gn index 95eaa31..7bd9355 100644 --- a/js/builtin/simulator/BUILD.gn +++ b/js/builtin/simulator/BUILD.gn @@ -13,95 +13,92 @@ # limitations under the License. # -if (os_level != "standard") { - 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", - ] - } - - 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", - ] - } - - 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" ] - } - - 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_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", - ] - } -} else { - group("ace_kit_common_simulator"){ - } -} \ No newline at end of file +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", + ] +} + +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", + ] + if (os_level != "standard") { + deps += [ "//foundation/arkui/ui_lite/ext/ide:ui_ide" ] + } +} + +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" ] +} + +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_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", + ] +} -- Gitee