修改编译相关代码

Signed-off-by: Agrant <luojuheng@huawei.com>
This commit is contained in:
Agrant
2025-05-20 20:02:41 +08:00
parent 1ef2857c09
commit aa528b009c
7 changed files with 34 additions and 33 deletions
+11 -10
View File
@@ -4,7 +4,7 @@
"description": "t2stack",
"publishAs": "code-segment",
"segment": {
"destPath": "t2stack"
"destPath": "foundation/communication/t2stack"
},
"dirs": {},
"scripts": {},
@@ -13,19 +13,19 @@
"license": "Apache License 2.0",
"component": {
"name": "t2stack",
"subsystem": "dsoftbus",
"subsystem": "communication",
"adapted_system_type": [
"mini",
"small",
"standard"
],
"features": [
"dsoftbus_feature_vtp",
"dsoftbus_feature_dfile",
"dsoftbus_feature_dmsg",
"dsoftbus_feature_dnet",
"dsoftbus_feature_linkfinder",
"dsoftbus_feature_coap"
"t2stack_feature_vtp",
"t2stack_feature_dfile",
"t2stack_feature_dmsg",
"t2stack_feature_dnet",
"t2stack_feature_linkfinder",
"t2stack_feature_coap"
],
"rom": "3000KB",
"ram": "40MB",
@@ -35,6 +35,7 @@
"hilog",
"openssl",
"c_utils",
"cJSON",
"mbedtls",
"libcoap"
],
@@ -50,8 +51,8 @@
]
},
"build": {
"moudles" : [
"//t2stack:nstackx"
"modules" : [
"//foundation/communication/t2stack:nstackx"
],
"inner_api": [
],
+7 -7
View File
@@ -11,8 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
DSOFTBUS_ROOT_PATH = "./.."
import("$DSOFTBUS_ROOT_PATH/t2stack.gni")
T2STACK_ROOT_PATH = "./.."
import("$T2STACK_ROOT_PATH/t2stack.gni")
fillp_include = [
"include",
@@ -42,7 +42,7 @@ if (defined(ohos_lite)) {
sources = []
deps = []
external_deps = []
if (dsoftbus_feature_vtp) {
if (t2stack_feature_vtp) {
sources += [
"src/app_lib/src/api.c",
"src/app_lib/src/epoll_app.c",
@@ -91,7 +91,7 @@ if (defined(ohos_lite)) {
"src/public/src/timing_wheel.c",
]
deps += [
"$DSOFTBUS_ROOT_PATH/nstackx_util:nstackx_util.open",
"$T2STACK_ROOT_PATH/nstackx_util:nstackx_util.open",
]
external_deps += [ "bounds_checking_function:libsec_shared" ]
}
@@ -124,7 +124,7 @@ if (defined(ohos_lite)) {
sources = []
deps = []
external_deps = []
if (dsoftbus_feature_vtp) {
if (t2stack_feature_vtp) {
sources += [
"src/app_lib/src/api.c",
"src/app_lib/src/epoll_app.c",
@@ -173,7 +173,7 @@ if (defined(ohos_lite)) {
"src/public/src/timing_wheel.c",
]
deps += [
"$DSOFTBUS_ROOT_PATH/nstackx_util:nstackx_util.open",
"$T2STACK_ROOT_PATH/nstackx_util:nstackx_util.open",
]
external_deps += [ "bounds_checking_function:libsec_shared" ]
}
@@ -183,6 +183,6 @@ if (defined(ohos_lite)) {
innerapi_tags = [ "platformsdk_indirect" ]
part_name = "t2stack"
subsystem_name = "dsoftbus"
subsystem_name = "communication"
}
}
+1 -1
View File
@@ -105,6 +105,6 @@ if (defined(ohos_lite)) {
}
innerapi_tags = [ "platformsdk_indirect" ]
part_name = "t2stack"
subsystem_name = "dsoftbus"
subsystem_name = "communication"
}
}
+4 -4
View File
@@ -56,7 +56,7 @@ if (defined(ohos_lite)) {
sources = []
deps = []
external_deps = []
if (dsoftbus_feature_dfile) {
if (t2stack_feature_dfile) {
sources += [
"$NSTACKX_ROOT/nstackx_core/platform/liteos/dfile/sys_dfile.c",
"$NSTACKX_ROOT/nstackx_core/platform/liteos/dfile/sys_dfile_session.c",
@@ -98,7 +98,7 @@ if (defined(ohos_lite)) {
sources = []
deps = []
external_deps = []
if (dsoftbus_feature_dfile) {
if (t2stack_feature_dfile) {
sources += [
"$NSTACKX_ROOT/nstackx_core/platform/unix/dfile/sys_dfile.c",
"$NSTACKX_ROOT/nstackx_core/platform/unix/dfile/sys_dfile_session.c",
@@ -163,7 +163,7 @@ if (defined(ohos_lite)) {
sources = []
deps = []
external_deps = []
if (dsoftbus_feature_dfile) {
if (t2stack_feature_dfile) {
sources += [
"$NSTACKX_ROOT/nstackx_core/platform/unix/dfile/sys_dfile.c",
"$NSTACKX_ROOT/nstackx_core/platform/unix/dfile/sys_dfile_session.c",
@@ -197,6 +197,6 @@ if (defined(ohos_lite)) {
}
innerapi_tags = [ "platformsdk_indirect" ]
part_name = "t2stack"
subsystem_name = "dsoftbus"
subsystem_name = "communication"
}
}
+5 -5
View File
@@ -16,7 +16,7 @@ import("$NSTACKX_ROOT/t2stack.gni")
# basic compilation options
if (dsoftbus_feature_inner_coap) {
if (t2stack_feature_inner_coap) {
cflags = [
"-DENABLE_USER_LOG",
"-DNSTACKX_EXTEND_BUSINESSDATA",
@@ -100,7 +100,7 @@ if (defined(ohos_lite)) {
if (ohos_kernel_type == "liteos_m") {
import("//build/lite/config/component/lite_component.gni")
static_library("nstackx_ctrl") {
if (!dsoftbus_feature_inner_coap) {
if (!t2stack_feature_inner_coap) {
sources = [ "core/nstackx_common_virtual.c" ]
include_dirs = [
"interface",
@@ -132,7 +132,7 @@ if (defined(ohos_lite)) {
} else {
import("//build/lite/config/component/lite_component.gni")
shared_library("nstackx_ctrl") {
if (!dsoftbus_feature_inner_coap) {
if (!t2stack_feature_inner_coap) {
sources = [ "core/nstackx_common_virtual.c" ]
include_dirs = [
"interface",
@@ -187,7 +187,7 @@ if (defined(ohos_lite)) {
}
branch_protector_ret = "pac_ret"
if (!dsoftbus_feature_inner_coap) {
if (!t2stack_feature_inner_coap) {
sources = [ "core/nstackx_common_virtual.c" ]
include_dirs = [
"interface",
@@ -216,6 +216,6 @@ if (defined(ohos_lite)) {
}
innerapi_tags = [ "platformsdk_indirect" ]
part_name = "t2stack"
subsystem_name = "dsoftbus"
subsystem_name = "communication"
}
}
+1 -1
View File
@@ -232,6 +232,6 @@ if (defined(ohos_lite)) {
public_configs = [ ":nstackx_util_header" ]
innerapi_tags = [ "platformsdk_indirect" ]
part_name = "t2stack"
subsystem_name = "dsoftbus"
subsystem_name = "communication"
}
}
+5 -5
View File
@@ -12,9 +12,9 @@
# limitations under the License.
declare_args() {
dsoftbus_feature_vtp = true
dsoftbus_feature_dfile = true
dsoftbus_feature_dmsg = true
dsoftbus_feature_coap = true
dsoftbus_feature_inner_coap = true
t2stack_feature_vtp = true
t2stack_feature_dfile = true
t2stack_feature_dmsg = true
t2stack_feature_coap = true
t2stack_feature_inner_coap = true
}