mirror of
https://github.com/openharmony/third_party_iptables.git
synced 2026-07-19 18:23:54 -04:00
!61 merge master into master
Optimize ROM
Created-by: Jackson-Wang-K
Commit-by: Jackson-Wang-K
Merged-by: openharmony_ci
Description: ### 一、内容说明（相关的Issue）
Optimize ROM
### 二、建议测试周期和提测地址
建议测试完成时间：xxxx.xx.xx
投产上线时间：xxxx.xx.xx
提测地址：CI环境/压测环境
测试账号：
### 三、变更内容
* 3.1 关联PR列表
* 3.2 数据库和部署说明
1. 常规更新
2. 重启unicorn
3. 重启sidekiq
4. 迁移任务：是否有迁移任务，没有写 "无"
5. rake脚本：`bundle exec xxx RAILS_ENV = production`；没有写 "无"
* 3.4 其他技术优化内容（做了什么，变更了什么）
- 重构了 xxxx 代码
- xxxx 算法优化
* 3.5 废弃通知（什么字段、方法弃用？）
* 3.6 后向不兼容变更（是否有无法向后兼容的变更？）
### 四、研发自测点（自测哪些？冒烟用例全部自测？）
自测测试结论：
### 五、测试关注点（需要提醒QA重点关注的、可能会忽略的地方）
检查点：
| 需求名称 | 是否影响xx公共模块 | 是否需要xx功能 | 需求升级是否依赖其他子产品 |
|------|------------|----------|---------------|
| xxx | 否 | 需要 | 不需要 |
| | | | |
接口测试：
性能测试：
并发测试：
其他：
See merge request: openharmony/third_party_iptables!61
This commit is contained in:
openharmony_ci
@@ -34,6 +34,18 @@ config("iptables_config") {
|
||||
"-DNO_SHARED_LIBS=1",
|
||||
"-DALL_INCLUSIVE",
|
||||
"-DXTABLES_INTERNAL",
|
||||
"-Oz",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
"-fvisibility=hidden",
|
||||
]
|
||||
cflags_cc = [
|
||||
"-fvisibility=hidden",
|
||||
"-fvisibility-inlines-hidden",
|
||||
]
|
||||
ldflags = [
|
||||
"-Wl,--exclude-libs=ALL",
|
||||
"-Wl,--gc-sections",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -72,85 +84,13 @@ ohos_executable("iptables") {
|
||||
"//third_party/iptables/libxtables:libxtables",
|
||||
]
|
||||
|
||||
symlink_target_name = [ "ip6tables" ]
|
||||
part_name = "iptables"
|
||||
subsystem_name = "thirdparty"
|
||||
}
|
||||
|
||||
ohos_executable("iptables-save") {
|
||||
branch_protector_ret = "pac_ret"
|
||||
sources = [
|
||||
"//third_party/iptables/iptables/ip6tables-standalone.c",
|
||||
"//third_party/iptables/iptables/ip6tables.c",
|
||||
"//third_party/iptables/iptables/iptables-restore.c",
|
||||
"//third_party/iptables/iptables/iptables-save.c",
|
||||
"//third_party/iptables/iptables/iptables-standalone.c",
|
||||
"//third_party/iptables/iptables/iptables-xml.c",
|
||||
"//third_party/iptables/iptables/iptables.c",
|
||||
"//third_party/iptables/iptables/xshared.c",
|
||||
"//third_party/iptables/iptables/xtables-legacy-multi.c",
|
||||
]
|
||||
|
||||
include_dirs = [
|
||||
"//third_party/iptables",
|
||||
"//third_party/iptables/extensions",
|
||||
"//third_party/iptables/include",
|
||||
"//third_party/iptables/iptables",
|
||||
"//third_party/iptables/libiptc",
|
||||
]
|
||||
configs = [ ":iptables_config" ]
|
||||
|
||||
install_enable = true
|
||||
|
||||
deps = [
|
||||
"//third_party/iptables/extensions:libext",
|
||||
"//third_party/iptables/extensions:libext4",
|
||||
"//third_party/iptables/extensions:libext6",
|
||||
"//third_party/iptables/libiptc:libip4tc",
|
||||
"//third_party/iptables/libiptc:libip6tc",
|
||||
"//third_party/iptables/libxtables:libxtables",
|
||||
]
|
||||
|
||||
symlink_target_name = [ "ip6tables-save" ]
|
||||
part_name = "iptables"
|
||||
subsystem_name = "thirdparty"
|
||||
}
|
||||
|
||||
ohos_executable("iptables-restore") {
|
||||
branch_protector_ret = "pac_ret"
|
||||
sources = [
|
||||
"//third_party/iptables/iptables/ip6tables-standalone.c",
|
||||
"//third_party/iptables/iptables/ip6tables.c",
|
||||
"//third_party/iptables/iptables/iptables-restore.c",
|
||||
"//third_party/iptables/iptables/iptables-save.c",
|
||||
"//third_party/iptables/iptables/iptables-standalone.c",
|
||||
"//third_party/iptables/iptables/iptables-xml.c",
|
||||
"//third_party/iptables/iptables/iptables.c",
|
||||
"//third_party/iptables/iptables/xshared.c",
|
||||
"//third_party/iptables/iptables/xtables-legacy-multi.c",
|
||||
]
|
||||
|
||||
include_dirs = [
|
||||
"//third_party/iptables",
|
||||
"//third_party/iptables/extensions",
|
||||
"//third_party/iptables/include",
|
||||
"//third_party/iptables/iptables",
|
||||
"//third_party/iptables/libiptc",
|
||||
]
|
||||
configs = [ ":iptables_config" ]
|
||||
|
||||
install_enable = true
|
||||
|
||||
deps = [
|
||||
"//third_party/iptables/extensions:libext",
|
||||
"//third_party/iptables/extensions:libext4",
|
||||
"//third_party/iptables/extensions:libext6",
|
||||
"//third_party/iptables/libiptc:libip4tc",
|
||||
"//third_party/iptables/libiptc:libip6tc",
|
||||
"//third_party/iptables/libxtables:libxtables",
|
||||
]
|
||||
|
||||
symlink_target_name = [ "ip6tables-restore" ]
|
||||
symlink_target_name = [
|
||||
"ip6tables",
|
||||
"ip6tables-restore",
|
||||
"ip6tables-save",
|
||||
"iptables-restore",
|
||||
"iptables-save",
|
||||
]
|
||||
part_name = "iptables"
|
||||
subsystem_name = "thirdparty"
|
||||
}
|
||||
|
||||
+3
-23
@@ -26,33 +26,13 @@
|
||||
},
|
||||
"build": {
|
||||
"sub_component": [
|
||||
"//third_party/iptables:iptables",
|
||||
"//third_party/iptables:iptables-restore",
|
||||
"//third_party/iptables:iptables-save"
|
||||
"//third_party/iptables:iptables"
|
||||
],
|
||||
"inner_kits": [
|
||||
{
|
||||
"name": "//third_party/iptables:iptables",
|
||||
"header": {
|
||||
"header_files": [],
|
||||
"header_base": "//third_party/iptables/include"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "//third_party/iptables:iptables-restore",
|
||||
"header": {
|
||||
"header_files": [],
|
||||
"header_base": "//third_party/iptables/include"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "//third_party/iptables:iptables-save",
|
||||
"header": {
|
||||
"header_files": [],
|
||||
"header_base": "//third_party/iptables/include"
|
||||
}
|
||||
"name":"//third_party/iptables:iptables"
|
||||
}
|
||||
],
|
||||
],
|
||||
"test": []
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,9 @@ config("ext_config") {
|
||||
"-Wno-missing-field-initializers",
|
||||
"-Wno-pointer-bool-conversion",
|
||||
"-Wno-tautological-pointer-compare",
|
||||
"-Oz",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -180,6 +183,9 @@ ohos_static_library("libext4") {
|
||||
"-Wno-missing-field-initializers",
|
||||
"-Wno-pointer-bool-conversion",
|
||||
"-Wno-tautological-pointer-compare",
|
||||
"-Oz",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
]
|
||||
deps = []
|
||||
part_name = "iptables"
|
||||
@@ -242,6 +248,9 @@ ohos_static_library("libext6") {
|
||||
"-Wno-missing-field-initializers",
|
||||
"-Wno-pointer-bool-conversion",
|
||||
"-Wno-tautological-pointer-compare",
|
||||
"-Oz",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
]
|
||||
deps = []
|
||||
part_name = "iptables"
|
||||
|
||||
@@ -36,6 +36,9 @@ ohos_static_library("libip4tc") {
|
||||
"-Wno-unused-parameter",
|
||||
"-Wno-pointer-sign",
|
||||
"-Wno-unused-function",
|
||||
"-Oz",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
]
|
||||
|
||||
deps = []
|
||||
@@ -67,6 +70,9 @@ ohos_static_library("libip6tc") {
|
||||
"-Wno-unused-parameter",
|
||||
"-Wno-pointer-sign",
|
||||
"-Wno-unused-function",
|
||||
"-Oz",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
]
|
||||
|
||||
deps = []
|
||||
|
||||
@@ -44,6 +44,9 @@ ohos_static_library("libxtables") {
|
||||
"-DXTABLES_INTERNAL",
|
||||
"-DXTABLES_LIBDIR=\"xtables_libdir_not_used\"",
|
||||
"-Wno-missing-field-initializers",
|
||||
"-Oz",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
]
|
||||
|
||||
deps = []
|
||||
|
||||
Reference in New Issue
Block a user