From 8f23691726ad1c64c6a8cdb64207004187176ff3 Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Sat, 13 Sep 2025 17:34:45 +0800 Subject: [PATCH] Remove the toolchain pass chain Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICXUC1?from=project-issue Signed-off-by: qianyong325 --- bundle.json | 3 +++ common_interfaces/BUILD.gn | 10 ++++++++++ common_interfaces/objects/base_string.h | 8 ++++---- common_interfaces/objects/readonly_handle.h | 2 +- .../objects/string/base_string-inl1.h | 10 +++++----- .../objects/string/base_string-inl2.h | 12 ++++++------ .../objects/string/base_string_declare.h | 14 +++++++------- .../objects/string/base_string_impl.h | 8 ++++---- common_interfaces/objects/string/line_string-inl.h | 4 ++-- common_interfaces/objects/string/line_string.h | 2 +- .../objects/string/sliced_string-inl.h | 4 ++-- common_interfaces/objects/string/sliced_string.h | 2 +- common_interfaces/objects/string/tree_string-inl.h | 4 ++-- common_interfaces/objects/string/tree_string.h | 2 +- common_interfaces/objects/utils/field_macro.h | 4 ++-- common_interfaces/objects/utils/objects_traits.h | 2 +- libpandabase/BUILD.gn | 9 +++++++++ libpandafile/BUILD.gn | 8 ++++++++ 18 files changed, 69 insertions(+), 39 deletions(-) diff --git a/bundle.json b/bundle.json index 4a4acc01f2..db4193a41c 100644 --- a/bundle.json +++ b/bundle.json @@ -304,6 +304,9 @@ { "name": "//arkcompiler/runtime_core/static_core/libpandabase:libpandabase_headers" }, + { + "name": "//arkcompiler/runtime_core/common_interfaces:runtime_core_header" + }, { "name": "//arkcompiler/runtime_core/static_core/libpandafile:libpandafile_headers" }, diff --git a/common_interfaces/BUILD.gn b/common_interfaces/BUILD.gn index 4ec0b9cff2..50e26ce9d6 100644 --- a/common_interfaces/BUILD.gn +++ b/common_interfaces/BUILD.gn @@ -28,3 +28,13 @@ ohos_static_library("common_interfaces_header") { part_name = "runtime_core" subsystem_name = "arkcompiler" } + +ohos_static_library("runtime_core_header") { + public_configs = [ + "$ark_root/libpandabase:libpandabase_public_config", + "$ark_root/libpandafile:arkfile_public_config", + ] + + part_name = "runtime_core" + subsystem_name = "arkcompiler" +} \ No newline at end of file diff --git a/common_interfaces/objects/base_string.h b/common_interfaces/objects/base_string.h index 67c2893c69..13dd8b81c9 100644 --- a/common_interfaces/objects/base_string.h +++ b/common_interfaces/objects/base_string.h @@ -15,8 +15,8 @@ #ifndef COMMON_INTERFACES_OBJECTS_BASE_STRING_H #define COMMON_INTERFACES_OBJECTS_BASE_STRING_H -#include "common_interfaces/objects/string/base_string_declare.h" -#include "common_interfaces/objects/string/base_string-inl1.h" -#include "common_interfaces/objects/string/base_string-inl2.h" -#include "common_interfaces/objects/string/base_string_impl.h" +#include "objects/string/base_string_declare.h" +#include "objects/string/base_string-inl1.h" +#include "objects/string/base_string-inl2.h" +#include "objects/string/base_string_impl.h" #endif // COMMON_INTERFACES_OBJECTS_BASE_STRING_H \ No newline at end of file diff --git a/common_interfaces/objects/readonly_handle.h b/common_interfaces/objects/readonly_handle.h index e08de8e0bc..a2dccf3d95 100644 --- a/common_interfaces/objects/readonly_handle.h +++ b/common_interfaces/objects/readonly_handle.h @@ -16,7 +16,7 @@ #ifndef COMMON_INTERFACES_OBJECTS_READONLY_HANDLE_H #define COMMON_INTERFACES_OBJECTS_READONLY_HANDLE_H -#include "common_interfaces/objects/base_object.h" +#include "objects/base_object.h" namespace common { template diff --git a/common_interfaces/objects/string/base_string-inl1.h b/common_interfaces/objects/string/base_string-inl1.h index 2b2cb18df0..30c2df95e5 100644 --- a/common_interfaces/objects/string/base_string-inl1.h +++ b/common_interfaces/objects/string/base_string-inl1.h @@ -18,12 +18,12 @@ #include -#include "common_interfaces/objects/string/base_string_declare.h" +#include "objects/string/base_string_declare.h" -#include "common_interfaces/objects/string/line_string-inl.h" -#include "common_interfaces/objects/string/sliced_string-inl.h" -#include "common_interfaces/objects/string/tree_string-inl.h" -#include "common_interfaces/objects/utils/utf_utils.h" +#include "objects/string/line_string-inl.h" +#include "objects/string/sliced_string-inl.h" +#include "objects/string/tree_string-inl.h" +#include "objects/utils/utf_utils.h" namespace common { inline bool BaseString::IsUtf8() const diff --git a/common_interfaces/objects/string/base_string-inl2.h b/common_interfaces/objects/string/base_string-inl2.h index cb731e2793..1cdbf2ebf8 100644 --- a/common_interfaces/objects/string/base_string-inl2.h +++ b/common_interfaces/objects/string/base_string-inl2.h @@ -19,12 +19,12 @@ #include "securec.h" #include "common_components/base/config.h" -#include "common_interfaces/base/mem.h" -#include "common_interfaces/objects/string/base_string_declare.h" -#include "common_interfaces/objects/string/line_string.h" -#include "common_interfaces/objects/string/sliced_string.h" -#include "common_interfaces/objects/string/tree_string.h" -#include "common_interfaces/objects/utils/utf_utils.h" +#include "base/mem.h" +#include "objects/string/base_string_declare.h" +#include "objects/string/line_string.h" +#include "objects/string/sliced_string.h" +#include "objects/string/tree_string.h" +#include "objects/utils/utf_utils.h" namespace common { template > diff --git a/common_interfaces/objects/string/base_string_declare.h b/common_interfaces/objects/string/base_string_declare.h index df53e5d59f..c6c28d2fb0 100644 --- a/common_interfaces/objects/string/base_string_declare.h +++ b/common_interfaces/objects/string/base_string_declare.h @@ -16,13 +16,13 @@ #ifndef COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_DECLARE_H #define COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_DECLARE_H -#include "common_interfaces/base/bit_field.h" -#include "common_interfaces/base/mem.h" -#include "common_interfaces/objects/base_object.h" -#include "common_interfaces/objects/utils/field_macro.h" -#include "common_interfaces/objects/utils/objects_traits.h" -#include "common_interfaces/objects/readonly_handle.h" -#include "libpandabase/utils/span.h" +#include "base/bit_field.h" +#include "base/mem.h" +#include "objects/base_object.h" +#include "objects/utils/field_macro.h" +#include "objects/utils/objects_traits.h" +#include "objects/readonly_handle.h" +#include "utils/span.h" #include diff --git a/common_interfaces/objects/string/base_string_impl.h b/common_interfaces/objects/string/base_string_impl.h index 215534e010..4e0cfd6a10 100644 --- a/common_interfaces/objects/string/base_string_impl.h +++ b/common_interfaces/objects/string/base_string_impl.h @@ -16,10 +16,10 @@ #ifndef COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_IMPL_H #define COMMON_INTERFACES_OBJECTS_STRING_BASE_STRING_IMPL_H -#include "common_interfaces/objects/string/base_string_declare.h" -#include "common_interfaces/objects/string/line_string.h" -#include "common_interfaces/objects/string/sliced_string.h" -#include "common_interfaces/objects/string/tree_string.h" +#include "objects/string/base_string_declare.h" +#include "objects/string/line_string.h" +#include "objects/string/sliced_string.h" +#include "objects/string/tree_string.h" namespace common { std::u16string Utf16ToU16String(const uint16_t *utf16Data, uint32_t dataLen); diff --git a/common_interfaces/objects/string/line_string-inl.h b/common_interfaces/objects/string/line_string-inl.h index 617e5ddc7c..1668099832 100644 --- a/common_interfaces/objects/string/line_string-inl.h +++ b/common_interfaces/objects/string/line_string-inl.h @@ -18,8 +18,8 @@ #include "common_components/base/globals.h" #include "common_components/common_runtime/hooks.h" -#include "common_interfaces/objects/string/base_string_declare.h" -#include "common_interfaces/objects/string/line_string.h" +#include "objects/string/base_string_declare.h" +#include "objects/string/line_string.h" namespace common { inline size_t LineString::ComputeSizeUtf8(uint32_t utf8Len) diff --git a/common_interfaces/objects/string/line_string.h b/common_interfaces/objects/string/line_string.h index 837c5e39fc..9f6aaa9bfe 100644 --- a/common_interfaces/objects/string/line_string.h +++ b/common_interfaces/objects/string/line_string.h @@ -16,7 +16,7 @@ #ifndef COMMON_INTERFACES_OBJECTS_STRING_LINE_STRING_H #define COMMON_INTERFACES_OBJECTS_STRING_LINE_STRING_H -#include "common_interfaces/objects/string/base_string_declare.h" +#include "objects/string/base_string_declare.h" namespace common { /* diff --git a/common_interfaces/objects/string/sliced_string-inl.h b/common_interfaces/objects/string/sliced_string-inl.h index 9f8039c136..8c49b3f21c 100644 --- a/common_interfaces/objects/string/sliced_string-inl.h +++ b/common_interfaces/objects/string/sliced_string-inl.h @@ -16,8 +16,8 @@ #ifndef COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_INL_H #define COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_INL_H -#include "common_interfaces/objects/string/base_string_declare.h" -#include "common_interfaces/objects/string/sliced_string.h" +#include "objects/string/base_string_declare.h" +#include "objects/string/sliced_string.h" namespace common { inline uint32_t SlicedString::GetStartIndex() const diff --git a/common_interfaces/objects/string/sliced_string.h b/common_interfaces/objects/string/sliced_string.h index f0f5a7902a..30ca249441 100644 --- a/common_interfaces/objects/string/sliced_string.h +++ b/common_interfaces/objects/string/sliced_string.h @@ -16,7 +16,7 @@ #ifndef COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_H #define COMMON_INTERFACES_OBJECTS_STRING_SLICED_STRING_H -#include "common_interfaces/objects/string/base_string_declare.h" +#include "objects/string/base_string_declare.h" namespace common { /* diff --git a/common_interfaces/objects/string/tree_string-inl.h b/common_interfaces/objects/string/tree_string-inl.h index 7adcffac6e..07ec8a17a1 100644 --- a/common_interfaces/objects/string/tree_string-inl.h +++ b/common_interfaces/objects/string/tree_string-inl.h @@ -16,8 +16,8 @@ #ifndef COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_INL_H #define COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_INL_H -#include "common_interfaces/objects/string/base_string_declare.h" -#include "common_interfaces/objects/string/tree_string.h" +#include "objects/string/base_string_declare.h" +#include "objects/string/tree_string.h" namespace common { template diff --git a/common_interfaces/objects/string/tree_string.h b/common_interfaces/objects/string/tree_string.h index 583491dde1..67f5221ca0 100644 --- a/common_interfaces/objects/string/tree_string.h +++ b/common_interfaces/objects/string/tree_string.h @@ -16,7 +16,7 @@ #ifndef COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_H #define COMMON_INTERFACES_OBJECTS_STRING_TREE_STRING_H -#include "common_interfaces/objects/string/base_string_declare.h" +#include "objects/string/base_string_declare.h" namespace common { /* diff --git a/common_interfaces/objects/utils/field_macro.h b/common_interfaces/objects/utils/field_macro.h index 6d0a6c53de..2ccd5bdf76 100644 --- a/common_interfaces/objects/utils/field_macro.h +++ b/common_interfaces/objects/utils/field_macro.h @@ -19,8 +19,8 @@ #include #include -#include "common_interfaces/objects/utils/objects_traits.h" -#include "common_interfaces/base_runtime.h" +#include "objects/utils/objects_traits.h" +#include "base_runtime.h" // CC-OFFNXT(C_RULE_ID_DEFINE_LENGTH_LIMIT) solid logic // CC-OFFNXT(G.PRE.02) code readability diff --git a/common_interfaces/objects/utils/objects_traits.h b/common_interfaces/objects/utils/objects_traits.h index 8c5e02badd..6d279cbf93 100644 --- a/common_interfaces/objects/utils/objects_traits.h +++ b/common_interfaces/objects/utils/objects_traits.h @@ -16,7 +16,7 @@ #ifndef COMMON_INTERFACES_OBJECTS_TRAITS_H #define COMMON_INTERFACES_OBJECTS_TRAITS_H -#include "common_interfaces/objects/base_object.h" +#include "objects/base_object.h" #include namespace common::objects_traits { diff --git a/libpandabase/BUILD.gn b/libpandabase/BUILD.gn index db1e4a25ba..3266f6e27d 100644 --- a/libpandabase/BUILD.gn +++ b/libpandabase/BUILD.gn @@ -28,6 +28,15 @@ config("arkbase_public_config") { } } +config("libpandabase_public_config") { + include_dirs = [ + "$ark_root/libpandabase", + "$ark_root/platforms", + "$target_gen_dir/include", + "$target_gen_dir", + ] +} + if (!ark_standalone_build && !is_arkui_x) { ohos_shared_headers("arkbase_public_headers") { include_dirs = [ diff --git a/libpandafile/BUILD.gn b/libpandafile/BUILD.gn index 527d602ee0..115bcfaeba 100644 --- a/libpandafile/BUILD.gn +++ b/libpandafile/BUILD.gn @@ -129,6 +129,14 @@ ohos_static_library("arkfile_header_deps") { subsystem_name = "arkcompiler" } +config("libpandafile_public_config") { + include_dirs = [ + "$ark_root/libpandafile", + "$target_gen_dir/include", + "$target_gen_dir", + ] +} + ohos_static_library("libarkfile_static") { sources = libarkfile_sources -- Gitee