ets_runtime conponent independence second fix

issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I9CH18
Signed-off-by: liujiahua <liujiahua12@huawei.com>

Change-Id: I8061961813f76f6599af9925e86bf84f7fd4d3cb

BUILD.gn

@@ -1191,11 +1191,14 @@ ohos_shared_library("libark_jsruntime") {
     }
   }
 
-  deps = [
-    ":libark_jsruntime_static",
-    sdk_libc_secshared_dep,
-  ]
+  deps = [ ":libark_jsruntime_static" ]
   external_deps = []
+  if (defined(is_arkui_x) && is_arkui_x && target_os == "ios") {
+    deps += [ "$ark_third_party_root/bounds_checking_function:libsec_static" ]
+  } else {
+    external_deps += [ "bounds_checking_function:libsec_shared" ]
+  }
+
   if (!is_arkui_x) {
     external_deps += [ "runtime_core:libarkfile_static" ]
   } else {

bundle.json

@@ -36,8 +36,6 @@
               "icu"
             ],
             "third_party": [
-              "bounds_checking_function",
-              "icu"
             ]
         },
         "build": {

ecmascript/compiler/codegen/maple/maple_ir/BUILD.gn

@@ -19,7 +19,6 @@ include_directories = [
   "${MAPLEALL_ROOT}/maple_util/include",
   "${MAPLEALL_ROOT}/maple_driver/include",
   "${MAPLEALL_ROOT}/mempool/include",
-  "${MAPLEALL_THIRD_PARTY_ROOT}/bounds_checking_function/include",
   "${MAPLEALL_ROOT}/maple_ipa/include",
   "${MAPLEALL_ROOT}/maple_ipa/include/old",
   "${MAPLEALL_ROOT}/maple_me/include",
@@ -64,6 +63,7 @@ ohos_static_library("libmplir") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libmplir
   include_dirs = include_directories
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   deps = [
     "${MAPLEALL_ROOT}/maple_driver:libdriver_option",

ecmascript/compiler/codegen/maple/maple_me/BUILD.gn

@@ -16,7 +16,6 @@ import("//arkcompiler/ets_runtime/js_runtime_config.gni")
 include_directories = [
   "${MAPLEALL_ROOT}/maple_ir/include",
   "${MAPLEALL_ROOT}/mempool/include",
-  "${MAPLEALL_THIRD_PARTY_ROOT}/bounds_checking_function/include",
   "${MAPLEALL_ROOT}/maple_me/include",
   "${MAPLEALL_ROOT}/maple_ipa/include",
   "${MAPLEALL_ROOT}/maple_ipa/include/old",
@@ -45,6 +44,7 @@ ohos_static_library("libmplme") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libmplme
   include_dirs = include_directories
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   part_name = "ets_runtime"
   subsystem_name = "arkcompiler"

ecmascript/compiler/codegen/maple/maple_pgo/BUILD.gn

@@ -26,7 +26,6 @@ include_libmplpgo = [
   "${MAPLEALL_ROOT}/maple_be/include/be",
   "${MAPLEALL_ROOT}/maple_be/include/ad",
   "${MAPLEALL_ROOT}/maple_be/include/ad/target",
-  "${MAPLEALL_THIRD_PARTY_ROOT}/bounds_checking_function/include",
   "${MAPLEALL_ROOT}/maple_driver/include",
   "${MAPLEALL_ROOT}/maple_phase/include",
 ]
@@ -41,6 +40,7 @@ ohos_static_library("libmplpgo") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libmplpgo
   include_dirs = include_libmplpgo
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   part_name = "ets_runtime"
   subsystem_name = "arkcompiler"

ecmascript/compiler/codegen/maple/maple_phase/BUILD.gn

@@ -26,7 +26,6 @@ include_libmplphase = [
   "${MAPLEALL_ROOT}/maple_be/include/be",
   "${MAPLEALL_ROOT}/maple_be/include/ad",
   "${MAPLEALL_ROOT}/maple_be/include/ad/target",
-  "${MAPLEALL_THIRD_PARTY_ROOT}/bounds_checking_function/include",
   "${MAPLEALL_ROOT}/maple_driver/include",
 ]
 
@@ -43,6 +42,7 @@ ohos_static_library("libmplphase") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libmplphase
   include_dirs = include_libmplphase
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   part_name = "ets_runtime"
   subsystem_name = "arkcompiler"

ecmascript/compiler/codegen/maple/maple_util/BUILD.gn

@@ -40,7 +40,6 @@ include_libmplutil = [
   "${MAPLEALL_ROOT}/maple_ir/include",
   "${MAPLEALL_ROOT}/mempool/include",
   "${MAPLEALL_ROOT}/maple_driver/include",
-  "${MAPLEALL_THIRD_PARTY_ROOT}/bounds_checking_function/include",
 ]
 
 include_libcommandline = [ "${MAPLEALL_ROOT}/maple_util/include" ]
@@ -50,6 +49,7 @@ ohos_static_library("libmplutil") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libmplutil
   include_dirs = include_libmplutil
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   libs = [ "pthread" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   part_name = "ets_runtime"
@@ -61,6 +61,7 @@ ohos_static_library("libcommandline") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libcommandline
   include_dirs = include_libcommandline
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   part_name = "ets_runtime"
   subsystem_name = "arkcompiler"

ecmascript/compiler/codegen/maple/mempool/BUILD.gn

@@ -22,7 +22,6 @@ include_directories = [
   "${MAPLEALL_ROOT}/maple_ir/include",
   "${MAPLEALL_ROOT}/maple_util/include",
   "${MAPLEALL_ROOT}/maple_driver/include",
-  "${MAPLEALL_THIRD_PARTY_ROOT}/bounds_checking_function/include",
 ]
 
 ohos_static_library("libmempool") {
@@ -30,6 +29,7 @@ ohos_static_library("libmempool") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libmempool
   include_dirs = include_directories
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   part_name = "ets_runtime"
   subsystem_name = "arkcompiler"

ecmascript/compiler/codegen/maple/mpl2mpl/BUILD.gn

@@ -23,7 +23,6 @@ include_directories = [
   "${MAPLEALL_ROOT}/maple_driver/include",
   "${MAPLEALL_ROOT}/mpl2mpl/include",
   "${MAPLEALL_ROOT}/mempool/include",
-  "${MAPLEALL_THIRD_PARTY_ROOT}/bounds_checking_function/include",
 ]
 
 src_libmpl2mpl = [
@@ -44,6 +43,7 @@ ohos_static_library("libmpl2mpl") {
   configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
   sources = src_libmpl2mpl
   include_dirs = include_directories
+  external_deps = [ "bounds_checking_function:libsec_static" ]
   output_dir = "${root_out_dir}/lib/${HOST_ARCH}"
   part_name = "ets_runtime"
   subsystem_name = "arkcompiler"