已合并
fix: 解耦c_utils #2901
fix: 解耦c_utils #2901
已合并
fan-jingle创建于 8月13日
共 36 个文件变更+50-3
@@ -64,6 +64,7 @@ if (!defined(ohos_lite)) {
64 64 
65 deps = [ "${appspawn_path}/util:libappspawn_util" ]65 deps = [ "${appspawn_path}/util:libappspawn_util" ]
66 external_deps = [66 external_deps = [
67+ "bounds_checking_function:libsec_shared",
67 "cJSON:cjson",68 "cJSON:cjson",
68 "c_utils:utils",69 "c_utils:utils",
69 "config_policy:configpolicy_util",70 "config_policy:configpolicy_util",
@@ -53,6 +53,7 @@ ohos_shared_library("appspawn_ace") {
53 "ability_runtime:runtime",53 "ability_runtime:runtime",
54 "access_token:libtokensetproc_shared",54 "access_token:libtokensetproc_shared",
55 "ace_engine:ace_forward_compatibility",55 "ace_engine:ace_forward_compatibility",
56+ "bounds_checking_function:libsec_shared",
56 "cJSON:cjson",57 "cJSON:cjson",
57 "c_utils:utils",58 "c_utils:utils",
58 "common_event_service:cesfwk_innerkits",59 "common_event_service:cesfwk_innerkits",
@@ -47,6 +47,7 @@ ohos_shared_library("appspawn_asan") {
47 defines += [ "HWASAN_TW" ]47 defines += [ "HWASAN_TW" ]
48 }48 }
49 external_deps = [49 external_deps = [
50+ "bounds_checking_function:libsec_shared",
50 "c_utils:utils",51 "c_utils:utils",
51 "hilog:libhilog",52 "hilog:libhilog",
52 "init:libbegetutil",53 "init:libbegetutil",
@@ -64,6 +64,7 @@ ohos_shared_library("appspawn_common") {
64 "access_token:libaccesstoken_sdk",64 "access_token:libaccesstoken_sdk",
65 "access_token:libtokenid_sdk",65 "access_token:libtokenid_sdk",
66 "access_token:libtokensetproc_shared",66 "access_token:libtokensetproc_shared",
67+ "bounds_checking_function:libsec_shared",
67 "cJSON:cjson",68 "cJSON:cjson",
68 "c_utils:utils",69 "c_utils:utils",
69 "config_policy:configpolicy_util",70 "config_policy:configpolicy_util",
@@ -44,6 +44,7 @@ ohos_shared_library("appspawn_nweb") {
44 }44 }
45 45 
46 external_deps = [46 external_deps = [
47+ "bounds_checking_function:libsec_shared",
47 "c_utils:utils",48 "c_utils:utils",
48 "hilog:libhilog",49 "hilog:libhilog",
49 "init:libbegetutil",50 "init:libbegetutil",
@@ -38,6 +38,7 @@ if (defined(appspawn_sandbox_new) && appspawn_sandbox_new) {
38 "${appspawn_path}/util:libappspawn_util",38 "${appspawn_path}/util:libappspawn_util",
39 ]39 ]
40 external_deps = [40 external_deps = [
41+ "bounds_checking_function:libsec_shared",
41 "cJSON:cjson",42 "cJSON:cjson",
42 "c_utils:utils",43 "c_utils:utils",
43 "hilog:libhilog",44 "hilog:libhilog",
@@ -101,6 +102,7 @@ if (defined(appspawn_sandbox_new) && appspawn_sandbox_new) {
101 "${appspawn_path}/util:libappspawn_util",102 "${appspawn_path}/util:libappspawn_util",
102 ]103 ]
103 external_deps = [104 external_deps = [
105+ "bounds_checking_function:libsec_shared",
104 "cJSON:cjson",106 "cJSON:cjson",
105 "c_utils:utils",107 "c_utils:utils",
106 "config_policy:configpolicy_util",108 "config_policy:configpolicy_util",
@@ -55,9 +55,9 @@ ohos_shared_library("libappspawn_spm") {
55 ]55 ]
56 56 
57 external_deps = [57 external_deps = [
58- "bounds_checking_function:libsec_shared",
59 "access_token:libtoken_setproc",58 "access_token:libtoken_setproc",
60 "access_token:libpermsetproc_shared",59 "access_token:libpermsetproc_shared",
60+ "bounds_checking_function:libsec_shared",
61 "hilog:libhilog",61 "hilog:libhilog",
62 "c_utils:utils",62 "c_utils:utils",
63 "init:libbegetutil",63 "init:libbegetutil",
@@ -80,6 +80,7 @@ ohos_executable("appspawn") {
80 }80 }
81 81 
82 external_deps = [82 external_deps = [
83+ "bounds_checking_function:libsec_shared",
83 "cJSON:cjson",84 "cJSON:cjson",
84 "c_utils:utils",85 "c_utils:utils",
85 "config_policy:configpolicy_util",86 "config_policy:configpolicy_util",
@@ -205,6 +206,7 @@ ohos_executable("cjappspawn") {
205 }206 }
206 207 
207 external_deps = [208 external_deps = [
209+ "bounds_checking_function:libsec_shared",
208 "cJSON:cjson",210 "cJSON:cjson",
209 "c_utils:utils",211 "c_utils:utils",
210 "config_policy:configpolicy_util",212 "config_policy:configpolicy_util",
@@ -277,6 +279,7 @@ ohos_executable("nativespawn") {
277 }279 }
278 280 
279 external_deps = [281 external_deps = [
282+ "bounds_checking_function:libsec_shared",
280 "cJSON:cjson",283 "cJSON:cjson",
281 "c_utils:utils",284 "c_utils:utils",
282 "config_policy:configpolicy_util",285 "config_policy:configpolicy_util",
@@ -370,6 +373,7 @@ ohos_executable("nwebspawn") {
370 }373 }
371 374 
372 external_deps = [375 external_deps = [
376+ "bounds_checking_function:libsec_shared",
373 "cJSON:cjson",377 "cJSON:cjson",
374 "c_utils:utils",378 "c_utils:utils",
375 "config_policy:configpolicy_util",379 "config_policy:configpolicy_util",
@@ -459,6 +463,7 @@ ohos_executable("hybridspawn") {
459 }463 }
460 464 
461 external_deps = [465 external_deps = [
466+ "bounds_checking_function:libsec_shared",
462 "cJSON:cjson",467 "cJSON:cjson",
463 "c_utils:utils",468 "c_utils:utils",
464 "config_policy:configpolicy_util",469 "config_policy:configpolicy_util",
@@ -45,6 +45,7 @@ ohos_executable("AppSpawnTest") {
45 ]45 ]
46 46 
47 external_deps = [47 external_deps = [
48+ "bounds_checking_function:libsec_shared",
48 "cJSON:cjson",49 "cJSON:cjson",
49 "c_utils:utils",50 "c_utils:utils",
50 "config_policy:configpolicy_util",51 "config_policy:configpolicy_util",
@@ -89,6 +90,7 @@ ohos_moduletest("AppSpawnModuleTest") {
89 ]90 ]
90 91 
91 external_deps = [92 external_deps = [
93+ "bounds_checking_function:libsec_shared",
92 "cJSON:cjson",94 "cJSON:cjson",
93 "c_utils:utils",95 "c_utils:utils",
94 "config_policy:configpolicy_util",96 "config_policy:configpolicy_util",
@@ -27,6 +27,7 @@ ohos_source_set("libappspawn_threadpool") {
27 ]27 ]
28 28 
29 external_deps = [29 external_deps = [
30+ "bounds_checking_function:libsec_shared",
30 "c_utils:utils",31 "c_utils:utils",
31 "hilog:libhilog",32 "hilog:libhilog",
32 "init:libbegetutil",33 "init:libbegetutil",
@@ -86,6 +86,7 @@ ohos_unittest("AppSpawn_client_ut") {
86 defines += [ "ASAN_DETECTOR" ]86 defines += [ "ASAN_DETECTOR" ]
87 }87 }
88 external_deps = [88 external_deps = [
89+ "bounds_checking_function:libsec_shared",
89 "cJSON:cjson",90 "cJSON:cjson",
90 "c_utils:utils",91 "c_utils:utils",
91 "config_policy:configpolicy_util",92 "config_policy:configpolicy_util",
@@ -57,6 +57,7 @@ if (!defined(ohos_lite)) {
57 ]57 ]
58 58 
59 external_deps = [59 external_deps = [
60+ "bounds_checking_function:libsec_shared",
60 "cJSON:cjson",61 "cJSON:cjson",
61 "c_utils:utils",62 "c_utils:utils",
62 "ffrt:libffrt",63 "ffrt:libffrt",
@@ -47,6 +47,7 @@ ohos_unittest("AppSpawn_HisysEvent_ut") {
47 ]47 ]
48 48 
49 external_deps = [49 external_deps = [
50+ "bounds_checking_function:libsec_shared",
50 "hisysevent:libhisysevent",51 "hisysevent:libhisysevent",
51 "hilog:libhilog",52 "hilog:libhilog",
52 "init:libbegetutil",53 "init:libbegetutil",
@@ -161,6 +161,7 @@ if (!defined(ohos_lite)) {
161 "ace_engine:ace_forward_compatibility",161 "ace_engine:ace_forward_compatibility",
162 "bundle_framework:appexecfwk_base",162 "bundle_framework:appexecfwk_base",
163 "bundle_framework:appexecfwk_core",163 "bundle_framework:appexecfwk_core",
164+ "bounds_checking_function:libsec_shared",
164 "cJSON:cjson",165 "cJSON:cjson",
165 "c_utils:utils",166 "c_utils:utils",
166 "config_policy:configpolicy_util",167 "config_policy:configpolicy_util",
@@ -360,6 +361,7 @@ if (!defined(ohos_lite)) {
360 "ace_engine:ace_forward_compatibility",361 "ace_engine:ace_forward_compatibility",
361 "bundle_framework:appexecfwk_base",362 "bundle_framework:appexecfwk_base",
362 "bundle_framework:appexecfwk_core",363 "bundle_framework:appexecfwk_core",
364+ "bounds_checking_function:libsec_shared",
363 "cJSON:cjson",365 "cJSON:cjson",
364 "c_utils:utils",366 "c_utils:utils",
365 "config_policy:configpolicy_util",367 "config_policy:configpolicy_util",
@@ -76,6 +76,7 @@ if (!defined(ohos_lite)) {
76 external_deps = [76 external_deps = [
77 "ability_runtime:appkit_native",77 "ability_runtime:appkit_native",
78 "ability_runtime:runtime",78 "ability_runtime:runtime",
79+ "bounds_checking_function:libsec_shared",
79 "cJSON:cjson",80 "cJSON:cjson",
80 "c_utils:utils",81 "c_utils:utils",
81 "config_policy:configpolicy_util",82 "config_policy:configpolicy_util",
@@ -70,6 +70,7 @@ if (!defined(ohos_lite)) {
70 70 
71 configs = [ "${appspawn_path}:appspawn_config" ]71 configs = [ "${appspawn_path}:appspawn_config" ]
72 external_deps = [72 external_deps = [
73+ "bounds_checking_function:libsec_shared",
73 "cJSON:cjson",74 "cJSON:cjson",
74 "c_utils:utils",75 "c_utils:utils",
75 "config_policy:configpolicy_util",76 "config_policy:configpolicy_util",
@@ -84,6 +84,7 @@ if (!defined(ohos_lite)) {
84 configs = [ "${appspawn_path}:appspawn_config" ]84 configs = [ "${appspawn_path}:appspawn_config" ]
85 external_deps = [85 external_deps = [
86 "access_token:libtokenid_sdk",86 "access_token:libtokenid_sdk",
87+ "bounds_checking_function:libsec_shared",
87 "cJSON:cjson",88 "cJSON:cjson",
88 "c_utils:utils",89 "c_utils:utils",
89 "config_policy:configpolicy_util",90 "config_policy:configpolicy_util",
@@ -78,12 +78,12 @@ if (!defined(ohos_lite)) {
78 78 
79 configs = [ "${appspawn_path}:appspawn_config" ]79 configs = [ "${appspawn_path}:appspawn_config" ]
80 external_deps = [80 external_deps = [
81+ "bounds_checking_function:libsec_shared",
81 "cJSON:cjson",82 "cJSON:cjson",
82 "c_utils:utils",83 "c_utils:utils",
83 "config_policy:configpolicy_util",84 "config_policy:configpolicy_util",
84 "faultloggerd:libdfx_dumpcatcher",85 "faultloggerd:libdfx_dumpcatcher",
85 "ffrt:libffrt",86 "ffrt:libffrt",
86- "bounds_checking_function:libsec_shared",
87 "googletest:gmock_main",87 "googletest:gmock_main",
88 "hilog:libhilog",88 "hilog:libhilog",
89 "hitrace:hitrace_meter",89 "hitrace:hitrace_meter",
@@ -92,6 +92,7 @@ if (!defined(ohos_lite)) {
92 92 
93 configs = [ "${appspawn_path}:appspawn_config" ]93 configs = [ "${appspawn_path}:appspawn_config" ]
94 external_deps = [94 external_deps = [
95+ "bounds_checking_function:libsec_shared",
95 "cJSON:cjson",96 "cJSON:cjson",
96 "c_utils:utils",97 "c_utils:utils",
97 "config_policy:configpolicy_util",98 "config_policy:configpolicy_util",
@@ -78,6 +78,7 @@ if (!defined(ohos_lite)) {
78 configs = [ "${appspawn_path}:appspawn_config" ]78 configs = [ "${appspawn_path}:appspawn_config" ]
79 external_deps = [79 external_deps = [
80 "access_token:libtokenid_sdk",80 "access_token:libtokenid_sdk",
81+ "bounds_checking_function:libsec_shared",
81 "cJSON:cjson",82 "cJSON:cjson",
82 "c_utils:utils",83 "c_utils:utils",
83 "config_policy:configpolicy_util",84 "config_policy:configpolicy_util",
@@ -86,6 +86,7 @@ if (!defined(ohos_lite)) {
86 "access_token:libaccesstoken_sdk",86 "access_token:libaccesstoken_sdk",
87 "access_token:libtokenid_sdk",87 "access_token:libtokenid_sdk",
88 "access_token:libtokensetproc_shared",88 "access_token:libtokensetproc_shared",
89+ "bounds_checking_function:libsec_shared",
89 "cJSON:cjson",90 "cJSON:cjson",
90 "code_signature:libcode_sign_attr_utils",91 "code_signature:libcode_sign_attr_utils",
91 "c_utils:utils",92 "c_utils:utils",
@@ -76,6 +76,7 @@ if (!defined(ohos_lite)) {
76 configs = [ "${appspawn_path}:appspawn_config" ]76 configs = [ "${appspawn_path}:appspawn_config" ]
77 external_deps = [77 external_deps = [
78 "access_token:libtokenid_sdk",78 "access_token:libtokenid_sdk",
79+ "bounds_checking_function:libsec_shared",
79 "cJSON:cjson",80 "cJSON:cjson",
80 "c_utils:utils",81 "c_utils:utils",
81 "config_policy:configpolicy_util",82 "config_policy:configpolicy_util",
@@ -65,6 +65,7 @@ if (!defined(ohos_lite)) {
65 65 
66 configs = [ "${appspawn_path}:appspawn_config" ]66 configs = [ "${appspawn_path}:appspawn_config" ]
67 external_deps = [67 external_deps = [
68+ "bounds_checking_function:libsec_shared",
68 "cJSON:cjson",69 "cJSON:cjson",
69 "c_utils:utils",70 "c_utils:utils",
70 "config_policy:configpolicy_util",71 "config_policy:configpolicy_util",
@@ -145,6 +145,7 @@ if (!defined(ohos_lite)) {
145 "ace_engine:ace_forward_compatibility",145 "ace_engine:ace_forward_compatibility",
146 "bundle_framework:appexecfwk_base",146 "bundle_framework:appexecfwk_base",
147 "bundle_framework:appexecfwk_core",147 "bundle_framework:appexecfwk_core",
148+ "bounds_checking_function:libsec_shared",
148 "cJSON:cjson",149 "cJSON:cjson",
149 "c_utils:utils",150 "c_utils:utils",
150 "config_policy:configpolicy_util",151 "config_policy:configpolicy_util",
@@ -68,6 +68,7 @@ if (!defined(ohos_lite)) {
68 68 
69 configs = [ "${appspawn_path}:appspawn_config" ]69 configs = [ "${appspawn_path}:appspawn_config" ]
70 external_deps = [70 external_deps = [
71+ "bounds_checking_function:libsec_shared",
71 "cJSON:cjson",72 "cJSON:cjson",
72 "c_utils:utils",73 "c_utils:utils",
73 "config_policy:configpolicy_util",74 "config_policy:configpolicy_util",
@@ -83,6 +83,7 @@ if (!defined(ohos_lite)) {
83 configs = [ "${appspawn_path}:appspawn_config" ]83 configs = [ "${appspawn_path}:appspawn_config" ]
84 external_deps = [84 external_deps = [
85 "access_token:libtokenid_sdk",85 "access_token:libtokenid_sdk",
86+ "bounds_checking_function:libsec_shared",
86 "cJSON:cjson",87 "cJSON:cjson",
87 "c_utils:utils",88 "c_utils:utils",
88 "config_policy:configpolicy_util",89 "config_policy:configpolicy_util",
@@ -85,6 +85,7 @@ if (!defined(ohos_lite)) {
85 85 
86 configs = [ "${appspawn_path}:appspawn_config" ]86 configs = [ "${appspawn_path}:appspawn_config" ]
87 external_deps = [87 external_deps = [
88+ "bounds_checking_function:libsec_shared",
88 "cJSON:cjson",89 "cJSON:cjson",
89 "c_utils:utils",90 "c_utils:utils",
90 "config_policy:configpolicy_util",91 "config_policy:configpolicy_util",
@@ -85,6 +85,7 @@ if (!defined(ohos_lite)) {
85 85 
86 configs = [ "${appspawn_path}:appspawn_config" ]86 configs = [ "${appspawn_path}:appspawn_config" ]
87 external_deps = [87 external_deps = [
88+ "bounds_checking_function:libsec_shared",
88 "cJSON:cjson",89 "cJSON:cjson",
89 "c_utils:utils",90 "c_utils:utils",
90 "config_policy:configpolicy_util",91 "config_policy:configpolicy_util",
@@ -65,6 +65,7 @@ if (!defined(ohos_lite)) {
65 65 
66 configs = [ "${appspawn_path}:appspawn_config" ]66 configs = [ "${appspawn_path}:appspawn_config" ]
67 external_deps = [67 external_deps = [
68+ "bounds_checking_function:libsec_shared",
68 "cJSON:cjson",69 "cJSON:cjson",
69 "c_utils:utils",70 "c_utils:utils",
70 "googletest:gmock_main",71 "googletest:gmock_main",
@@ -58,6 +58,7 @@ if (!defined(ohos_lite)) {
58 58 
59 configs = [ "${appspawn_path}:appspawn_config" ]59 configs = [ "${appspawn_path}:appspawn_config" ]
60 external_deps = [60 external_deps = [
61+ "bounds_checking_function:libsec_shared",
61 "cJSON:cjson",62 "cJSON:cjson",
62 "c_utils:utils",63 "c_utils:utils",
63 "config_policy:configpolicy_util",64 "config_policy:configpolicy_util",
@@ -145,6 +145,7 @@ if (!defined(ohos_lite)) {
145 145 
146 configs = [ "${appspawn_path}:appspawn_config" ]146 configs = [ "${appspawn_path}:appspawn_config" ]
147 external_deps = [147 external_deps = [
148+ "bounds_checking_function:libsec_shared",
148 "cJSON:cjson",149 "cJSON:cjson",
149 "c_utils:utils",150 "c_utils:utils",
150 "config_policy:configpolicy_util",151 "config_policy:configpolicy_util",
@@ -59,6 +59,7 @@ if (!defined(ohos_lite)) {
59 external_deps = [59 external_deps = [
60 "access_token:libtokenid_sdk",60 "access_token:libtokenid_sdk",
61 "access_token:libtokensetproc_shared",61 "access_token:libtokensetproc_shared",
62+ "bounds_checking_function:libsec_shared",
62 "cJSON:cjson",63 "cJSON:cjson",
63 "c_utils:utils",64 "c_utils:utils",
64 "config_policy:configpolicy_util",65 "config_policy:configpolicy_util",
@@ -48,6 +48,7 @@ if (!defined(ohos_lite)) {
48 48 
49 configs = [ "${appspawn_path}:appspawn_config" ]49 configs = [ "${appspawn_path}:appspawn_config" ]
50 external_deps = [50 external_deps = [
51+ "bounds_checking_function:libsec_shared",
51 "cJSON:cjson",52 "cJSON:cjson",
52 "c_utils:utils",53 "c_utils:utils",
53 "hilog:libhilog",54 "hilog:libhilog",
@@ -142,6 +143,7 @@ if (!defined(ohos_lite)) {
142 "ace_engine:ace_forward_compatibility",143 "ace_engine:ace_forward_compatibility",
143 "bundle_framework:appexecfwk_base",144 "bundle_framework:appexecfwk_base",
144 "bundle_framework:appexecfwk_core",145 "bundle_framework:appexecfwk_core",
146+ "bounds_checking_function:libsec_shared",
145 "cJSON:cjson",147 "cJSON:cjson",
146 "config_policy:configpolicy_util",148 "config_policy:configpolicy_util",
147 "c_utils:utils",149 "c_utils:utils",
@@ -273,6 +275,7 @@ if (!defined(ohos_lite)) {
273 "ace_engine:ace_forward_compatibility",275 "ace_engine:ace_forward_compatibility",
274 "bundle_framework:appexecfwk_base",276 "bundle_framework:appexecfwk_base",
275 "bundle_framework:appexecfwk_core",277 "bundle_framework:appexecfwk_core",
278+ "bounds_checking_function:libsec_shared",
276 "cJSON:cjson",279 "cJSON:cjson",
277 "config_policy:configpolicy_util",280 "config_policy:configpolicy_util",
278 "c_utils:utils",281 "c_utils:utils",
@@ -81,6 +81,7 @@ if (!defined(ohos_lite)) {
81 configs = [ "${appspawn_path}:appspawn_config" ]81 configs = [ "${appspawn_path}:appspawn_config" ]
82 external_deps = [82 external_deps = [
83 "access_token:libtokenid_sdk",83 "access_token:libtokenid_sdk",
84+ "bounds_checking_function:libsec_shared",
84 "cJSON:cjson",85 "cJSON:cjson",
85 "c_utils:utils",86 "c_utils:utils",
86 "config_policy:configpolicy_util",87 "config_policy:configpolicy_util",
@@ -63,6 +63,7 @@ if (!defined(ohos_lite)) {
63 63 
64 configs = [ "${appspawn_path}:appspawn_config" ]64 configs = [ "${appspawn_path}:appspawn_config" ]
65 external_deps = [65 external_deps = [
66+ "bounds_checking_function:libsec_shared",
66 "cJSON:cjson",67 "cJSON:cjson",
67 "c_utils:utils",68 "c_utils:utils",
68 "config_policy:configpolicy_util",69 "config_policy:configpolicy_util",
@@ -176,6 +177,7 @@ if (!defined(ohos_lite)) {
176 "ace_engine:ace_forward_compatibility",177 "ace_engine:ace_forward_compatibility",
177 "bundle_framework:appexecfwk_base",178 "bundle_framework:appexecfwk_base",
178 "bundle_framework:appexecfwk_core",179 "bundle_framework:appexecfwk_core",
180+ "bounds_checking_function:libsec_shared",
179 "cJSON:cjson",181 "cJSON:cjson",
180 "c_utils:utils",182 "c_utils:utils",
181 "config_policy:configpolicy_util",183 "config_policy:configpolicy_util",
@@ -334,6 +336,7 @@ if (!defined(ohos_lite)) {
334 "ace_engine:ace_forward_compatibility",336 "ace_engine:ace_forward_compatibility",
335 "bundle_framework:appexecfwk_base",337 "bundle_framework:appexecfwk_base",
336 "bundle_framework:appexecfwk_core",338 "bundle_framework:appexecfwk_core",
339+ "bounds_checking_function:libsec_shared",
337 "cJSON:cjson",340 "cJSON:cjson",
338 "c_utils:utils",341 "c_utils:utils",
339 "config_policy:configpolicy_util",342 "config_policy:configpolicy_util",
@@ -36,7 +36,10 @@ ohos_static_library("libappspawn_util") {
36 ]36 ]
37 37 
38 if (!defined(ohos_lite)) {38 if (!defined(ohos_lite)) {
39- external_deps += [ "c_utils:utils" ]39+ external_deps += [
40+ "c_utils:utils",
41+ "bounds_checking_function:libsec_shared",
42+ ]
40 }43 }
41 44 
42 public_configs = [ "${appspawn_path}:appspawn_config" ]45 public_configs = [ "${appspawn_path}:appspawn_config" ]