openharmony/distributeddatamgr_relational_store
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributeddatamgr_relational_store synced 2025-02-17 00:39:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tid 获取排除 android 和 ios

Browse Source 
Change-Id: I4b8f65aff74a9f708b5cb27c76a60e22e58fdaf2
Signed-off-by: ZhaoJinghui <zhaojinghui5@huawei.com>
This commit is contained in:
ZhaoJinghui 2024-10-16 10:24:20 +08:00
parent c8d9f4297f
commit 0dc9fc8daa
5 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/js/napi/common/include/js_df_manager.h
View File

@ -31,5 +31,5 @@ private:
};
}
constexpr auto LOWER_24_BITS_MASK = (1 << 24) - 1;
constexpr auto LOWER_24_BITS_MASK = (1u << 24) - 1;
#endif // OHOS_DISTRIBUTED_DATA_RELATIONAL_STORE_FRAMEWORKS_JS_NAPI_COMMON_JSUAF_MANAGER_H

2
frameworks/js/napi/common/src/js_df_manager.cpp
View File

@ -42,7 +42,7 @@ int32_t JSDFManager::GetFreedTid(void *data)
if (tid != 0) {
freedTid = tid;
} else {
#if defined(WINDOWS_PLATFORM) || defined(MAC_PLATFORM)
#if defined(CROSS_PLATFORM)
tid = 0;
#else
tid = gettid();

20
frameworks/js/napi/rdb/BUILD.gn
View File

@ -53,10 +53,16 @@ ohos_shared_library("napi_rdb") {
]
if (is_mac) {
buildos = "mac"
defines = [ "MAC_PLATFORM" ]
defines = [
"MAC_PLATFORM",
"CROSS_PLATFORM",
]
} else {
buildos = "windows"
defines = [ "WINDOWS_PLATFORM" ]
defines = [
"WINDOWS_PLATFORM",
"CROSS_PLATFORM",
]
}
sources += [ "${relational_store_js_common_path}/mock/src/js_ability.cpp" ]
deps = [
@ -124,10 +130,16 @@ ohos_shared_library("rdb") {
]
if (is_mac) {
buildos = "mac"
defines = [ "MAC_PLATFORM" ]
defines = [
"MAC_PLATFORM",
"CROSS_PLATFORM",
]
} else {
buildos = "windows"
defines = [ "WINDOWS_PLATFORM" ]
defines = [
"WINDOWS_PLATFORM",
"CROSS_PLATFORM",
]
}
deps = [

11
frameworks/js/napi/relationalstore/BUILD.gn
View File

@ -101,6 +101,7 @@ if (is_ohos) {
buildos = "windows"
defines = [
"WINDOWS_PLATFORM",
"CROSS_PLATFORM",
"API_EXPORT=__declspec(dllimport)",
]
@ -137,7 +138,10 @@ if (is_ohos) {
]
buildos = "mac"
defines = [ "MAC_PLATFORM" ]
defines = [
"MAC_PLATFORM",
"CROSS_PLATFORM",
]
sources += [ "${relational_store_js_common_path}/mock/src/js_ability.cpp" ]
@ -213,7 +217,10 @@ if (is_ohos) {
"-stdlib=libc++",
]
defines = [ "IOS_PLATFORM" ]
defines = [
"IOS_PLATFORM",
"CROSS_PLATFORM",
]
sources += [ "${relational_store_js_common_path}/mock/src/js_ability.cpp" ]

15
interfaces/inner_api/rdb/BUILD.gn
View File

@ -274,7 +274,10 @@ if (is_ohos && !build_ohos_sdk) {
defines += [ "RDB_SUPPORT_ICU" ]
}
defines += [ "WINDOWS_PLATFORM" ]
defines += [
"WINDOWS_PLATFORM",
"CROSS_PLATFORM",
]
include_dirs += [
"//foundation/distributeddatamgr/kv_store/frameworks/common",
"//third_party/sqlite/include",
@ -380,7 +383,10 @@ if (is_ohos && !build_ohos_sdk) {
defines += [ "RDB_SUPPORT_ICU" ]
}
defines += [ "MAC_PLATFORM" ]
defines += [
"MAC_PLATFORM",
"CROSS_PLATFORM",
]
include_dirs += [
"//foundation/distributeddatamgr/kv_store/frameworks/common",
"//third_party/sqlite/include",
@ -572,7 +578,10 @@ if (is_ohos && !build_ohos_sdk) {
base_deps = [ "${plugins_path}/libs/icu:icu_ios" ]
ohos_source_set("native_rdb") {
defines = [ "IOS_PLATFORM" ]
defines = [
"IOS_PLATFORM",
"CROSS_PLATFORM",
]
part_name = "relational_store"
sources = base_sources