From 06d69d992dc8bf7221cb90b3d71d1b8061785e10 Mon Sep 17 00:00:00 2001 From: ivagin Date: Sat, 21 Jun 2025 00:14:27 +0300 Subject: [PATCH] Fixed libarkbase includes Issue: ICEF8V Signed-off-by: ivagin --- tooling/static/connection/asio/asio_server.cpp | 6 +++--- tooling/static/connection/asio/ws_logger.cpp | 6 +++--- tooling/static/connection/asio/ws_logger.h | 4 ++-- tooling/static/connection/endpoint_base.cpp | 8 ++++---- tooling/static/connection/endpoint_base.h | 4 ++-- tooling/static/connection/event_loop.cpp | 2 +- tooling/static/connection/event_loop.h | 2 +- tooling/static/connection/ohos_ws/ohos_ws_server.cpp | 4 ++-- tooling/static/connection/server.h | 4 ++-- tooling/static/connection/server_endpoint_base.cpp | 2 +- tooling/static/debugger/breakpoint_storage.cpp | 2 +- tooling/static/debugger/debug_info_cache.cpp | 4 ++-- tooling/static/debugger/object_repository.h | 2 +- tooling/static/debugger/thread_state.cpp | 2 +- tooling/static/error.cpp | 4 ++-- tooling/static/evaluation/base64.h | 6 +++--- tooling/static/inspector.cpp | 6 +++--- tooling/static/inspector.h | 2 +- tooling/static/inspector_server.cpp | 10 +++++----- tooling/static/json_serialization/jrpc_error.cpp | 2 +- tooling/static/json_serialization/serializable.h | 2 +- tooling/static/source_manager.h | 2 +- tooling/static/tests/common.h | 6 +++--- tooling/static/tests/inspector_server.cpp | 2 +- tooling/static/tests/json_object_matcher.h | 6 +++--- tooling/static/tests/test_frame.h | 6 +++--- .../static/types/custom_url_breakpoint_response.cpp | 2 +- tooling/static/types/custom_url_breakpoint_response.h | 2 +- .../static/types/debugger_call_function_on_request.cpp | 2 +- .../static/types/debugger_call_function_on_request.h | 4 ++-- tooling/static/types/debugger_evaluation_request.cpp | 2 +- tooling/static/types/debugger_evaluation_request.h | 4 ++-- tooling/static/types/evaluation_result.h | 4 ++-- tooling/static/types/exception_details.cpp | 4 ++-- tooling/static/types/exception_details.h | 2 +- tooling/static/types/location.cpp | 6 +++--- tooling/static/types/location.h | 2 +- tooling/static/types/numeric_id.h | 6 +++--- tooling/static/types/object_preview.cpp | 2 +- tooling/static/types/possible_breakpoints_response.h | 2 +- tooling/static/types/profile_result.h | 2 +- tooling/static/types/property_descriptor.h | 2 +- tooling/static/types/remote_object.cpp | 4 ++-- tooling/static/types/remote_object_type.h | 2 +- tooling/static/types/scope.cpp | 4 ++-- tooling/static/types/script_source_response.h | 4 ++-- tooling/static/types/url_breakpoint_request.cpp | 2 +- tooling/static/types/url_breakpoint_request.h | 4 ++-- tooling/static/types/url_breakpoint_response.cpp | 2 +- tooling/static/types/url_breakpoint_response.h | 2 +- 50 files changed, 89 insertions(+), 89 deletions(-) diff --git a/tooling/static/connection/asio/asio_server.cpp b/tooling/static/connection/asio/asio_server.cpp index d7f0af57..5e0f0378 100644 --- a/tooling/static/connection/asio/asio_server.cpp +++ b/tooling/static/connection/asio/asio_server.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,8 +23,8 @@ #include "websocketpp/http/constants.hpp" #include "websocketpp/uri.hpp" -#include "utils/json_builder.h" -#include "utils/logger.h" +#include "libarkbase/utils/json_builder.h" +#include "libarkbase/utils/logger.h" #include "connection/asio/asio_config.h" diff --git a/tooling/static/connection/asio/ws_logger.cpp b/tooling/static/connection/asio/ws_logger.cpp index 8b895ba5..ba1c9450 100644 --- a/tooling/static/connection/asio/ws_logger.cpp +++ b/tooling/static/connection/asio/ws_logger.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,8 +17,8 @@ #include "websocketpp/logger/levels.hpp" -#include "macros.h" -#include "utils/logger.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/logger.h" namespace ark::tooling::inspector { void WsLogger::set_channels(Level channels) diff --git a/tooling/static/connection/asio/ws_logger.h b/tooling/static/connection/asio/ws_logger.h index b5ecbf41..7aeffcb4 100644 --- a/tooling/static/connection/asio/ws_logger.h +++ b/tooling/static/connection/asio/ws_logger.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,7 +20,7 @@ #include "websocketpp/logger/levels.hpp" -#include "utils/logger.h" +#include "libarkbase/utils/logger.h" namespace ark::tooling::inspector { class WsLogger { diff --git a/tooling/static/connection/endpoint_base.cpp b/tooling/static/connection/endpoint_base.cpp index 5f06a37a..3a60f662 100644 --- a/tooling/static/connection/endpoint_base.cpp +++ b/tooling/static/connection/endpoint_base.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,9 +17,9 @@ #include -#include "utils/json_builder.h" -#include "utils/json_parser.h" -#include "utils/logger.h" +#include "libarkbase/utils/json_builder.h" +#include "libarkbase/utils/json_parser.h" +#include "libarkbase/utils/logger.h" namespace ark::tooling::inspector { void EndpointBase::OnCall(const char *method, EndpointBase::MethodHandler &&handler) diff --git a/tooling/static/connection/endpoint_base.h b/tooling/static/connection/endpoint_base.h index 629bd741..23956beb 100644 --- a/tooling/static/connection/endpoint_base.h +++ b/tooling/static/connection/endpoint_base.h @@ -23,8 +23,8 @@ #include #include -#include "utils/json_builder.h" -#include "utils/logger.h" +#include "libarkbase/utils/json_builder.h" +#include "libarkbase/utils/logger.h" #include "json_serialization/jrpc_error.h" diff --git a/tooling/static/connection/event_loop.cpp b/tooling/static/connection/event_loop.cpp index c55b4da3..b126c7c8 100644 --- a/tooling/static/connection/event_loop.cpp +++ b/tooling/static/connection/event_loop.cpp @@ -15,7 +15,7 @@ #include "connection/event_loop.h" -#include "macros.h" +#include "libarkbase/macros.h" namespace ark::tooling::inspector { bool EventLoop::Kill() diff --git a/tooling/static/connection/event_loop.h b/tooling/static/connection/event_loop.h index 73e2f518..089567a9 100644 --- a/tooling/static/connection/event_loop.h +++ b/tooling/static/connection/event_loop.h @@ -18,7 +18,7 @@ #include -#include "os/mutex.h" +#include "libarkbase/os/mutex.h" namespace ark::tooling::inspector { class EventLoop { diff --git a/tooling/static/connection/ohos_ws/ohos_ws_server.cpp b/tooling/static/connection/ohos_ws/ohos_ws_server.cpp index 5d9e8065..83eeaabf 100644 --- a/tooling/static/connection/ohos_ws/ohos_ws_server.cpp +++ b/tooling/static/connection/ohos_ws/ohos_ws_server.cpp @@ -17,8 +17,8 @@ #include -#include "os/thread.h" -#include "utils/logger.h" +#include "libarkbase/os/thread.h" +#include "libarkbase/utils/logger.h" #include "inspector.h" namespace ark::tooling::inspector { diff --git a/tooling/static/connection/server.h b/tooling/static/connection/server.h index 46ef13fd..afc6712a 100644 --- a/tooling/static/connection/server.h +++ b/tooling/static/connection/server.h @@ -19,8 +19,8 @@ #include #include "json_serialization/serializable.h" -#include "libpandabase/utils/expected.h" -#include "libpandabase/utils/json_builder.h" +#include "libarkbase/utils/expected.h" +#include "libarkbase/utils/json_builder.h" #include "connection/event_loop.h" #include "json_serialization/jrpc_error.h" diff --git a/tooling/static/connection/server_endpoint_base.cpp b/tooling/static/connection/server_endpoint_base.cpp index bedbc976..e2434a3d 100644 --- a/tooling/static/connection/server_endpoint_base.cpp +++ b/tooling/static/connection/server_endpoint_base.cpp @@ -15,7 +15,7 @@ #include "connection/server_endpoint_base.h" -#include "utils/logger.h" +#include "libarkbase/utils/logger.h" namespace ark::tooling::inspector { diff --git a/tooling/static/debugger/breakpoint_storage.cpp b/tooling/static/debugger/breakpoint_storage.cpp index f0a7185f..77c425f7 100644 --- a/tooling/static/debugger/breakpoint_storage.cpp +++ b/tooling/static/debugger/breakpoint_storage.cpp @@ -17,7 +17,7 @@ #include "breakpoint.h" #include "conditional_breakpoint.h" -#include "os/mutex.h" +#include "libarkbase/os/mutex.h" namespace ark::tooling::inspector { diff --git a/tooling/static/debugger/debug_info_cache.cpp b/tooling/static/debugger/debug_info_cache.cpp index f527cbd1..18c54cff 100644 --- a/tooling/static/debugger/debug_info_cache.cpp +++ b/tooling/static/debugger/debug_info_cache.cpp @@ -17,9 +17,9 @@ #include "libarkfile/debug_info_extractor.h" #include "include/tooling/pt_location.h" -#include "libpandabase/utils/bit_utils.h" +#include "libarkbase/utils/bit_utils.h" #include "libarkfile/method_data_accessor.h" -#include "os/mutex.h" +#include "libarkbase/os/mutex.h" namespace ark::tooling::inspector { void DebugInfoCache::AddPandaFile(const panda_file::File &file, bool isUserPandafile) diff --git a/tooling/static/debugger/object_repository.h b/tooling/static/debugger/object_repository.h index 1a6bc281..07dbe1ae 100644 --- a/tooling/static/debugger/object_repository.h +++ b/tooling/static/debugger/object_repository.h @@ -18,7 +18,7 @@ #include "include/tooling/debug_interface.h" #include "include/typed_value.h" -#include "os/mutex.h" +#include "libarkbase/os/mutex.h" #include "runtime/handle_scope.h" #include "types/numeric_id.h" diff --git a/tooling/static/debugger/thread_state.cpp b/tooling/static/debugger/thread_state.cpp index 94554d9c..4c0ba782 100644 --- a/tooling/static/debugger/thread_state.cpp +++ b/tooling/static/debugger/thread_state.cpp @@ -20,7 +20,7 @@ #include #include "include/tooling/pt_location.h" -#include "macros.h" +#include "libarkbase/macros.h" #include "breakpoint.h" #include "error.h" #include "types/numeric_id.h" diff --git a/tooling/static/error.cpp b/tooling/static/error.cpp index 7ed13ada..eddbfa23 100644 --- a/tooling/static/error.cpp +++ b/tooling/static/error.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +15,7 @@ #include "error.h" -#include "utils/logger.h" +#include "libarkbase/utils/logger.h" namespace ark::tooling::inspector { bool HandleError(std::optional &&error) diff --git a/tooling/static/evaluation/base64.h b/tooling/static/evaluation/base64.h index 0b10e679..98530f94 100644 --- a/tooling/static/evaluation/base64.h +++ b/tooling/static/evaluation/base64.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,8 +20,8 @@ #include #include -#include "libpandabase/macros.h" -#include "libpandabase/utils/span.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/span.h" namespace ark::tooling::inspector { class Base64Decoder final { diff --git a/tooling/static/inspector.cpp b/tooling/static/inspector.cpp index cc55c7c0..08044c3d 100644 --- a/tooling/static/inspector.cpp +++ b/tooling/static/inspector.cpp @@ -21,10 +21,10 @@ #include #include "debugger/breakpoint.h" -#include "macros.h" -#include "os/mutex.h" +#include "libarkbase/macros.h" +#include "libarkbase/os/mutex.h" #include "include/runtime.h" -#include "utils/logger.h" +#include "libarkbase/utils/logger.h" #include "error.h" #include "evaluation/base64.h" diff --git a/tooling/static/inspector.h b/tooling/static/inspector.h index e81e29a6..efed04d4 100644 --- a/tooling/static/inspector.h +++ b/tooling/static/inspector.h @@ -35,7 +35,7 @@ #include "common.h" #include "inspector_server.h" #include "runtime/tooling/tools.h" -#include "os/mutex.h" +#include "libarkbase/os/mutex.h" #include "types/evaluation_result.h" #include "types/numeric_id.h" #include "types/pause_on_exceptions_state.h" diff --git a/tooling/static/inspector_server.cpp b/tooling/static/inspector_server.cpp index 5130066c..da56b5ad 100644 --- a/tooling/static/inspector_server.cpp +++ b/tooling/static/inspector_server.cpp @@ -24,11 +24,11 @@ #include "include/console_call_type.h" #include "include/tooling/pt_thread.h" #include "json_serialization/serializable.h" -#include "macros.h" -#include "utils/expected.h" -#include "utils/json_builder.h" -#include "utils/json_parser.h" -#include "utils/logger.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/expected.h" +#include "libarkbase/utils/json_builder.h" +#include "libarkbase/utils/json_parser.h" +#include "libarkbase/utils/logger.h" #include "connection/server.h" #include "json_serialization/jrpc_error.h" diff --git a/tooling/static/json_serialization/jrpc_error.cpp b/tooling/static/json_serialization/jrpc_error.cpp index 0d2105bd..ab33d687 100644 --- a/tooling/static/json_serialization/jrpc_error.cpp +++ b/tooling/static/json_serialization/jrpc_error.cpp @@ -15,7 +15,7 @@ #include "json_serialization/jrpc_error.h" -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" namespace ark::tooling::inspector { diff --git a/tooling/static/json_serialization/serializable.h b/tooling/static/json_serialization/serializable.h index 4cf3ba93..e0d28ef9 100644 --- a/tooling/static/json_serialization/serializable.h +++ b/tooling/static/json_serialization/serializable.h @@ -16,7 +16,7 @@ #ifndef PANDA_TOOLING_INSPECTOR_JSON_SERIALIZATION_SERIALIZABLE_H #define PANDA_TOOLING_INSPECTOR_JSON_SERIALIZATION_SERIALIZABLE_H -#include "macros.h" +#include "libarkbase/macros.h" namespace ark { class JsonObjectBuilder; diff --git a/tooling/static/source_manager.h b/tooling/static/source_manager.h index 8b77611e..3ea349ef 100644 --- a/tooling/static/source_manager.h +++ b/tooling/static/source_manager.h @@ -24,7 +24,7 @@ #include #include "include/tooling/pt_thread.h" -#include "os/mutex.h" +#include "libarkbase/os/mutex.h" #include "types/numeric_id.h" diff --git a/tooling/static/tests/common.h b/tooling/static/tests/common.h index 4608bede..098cb3d2 100644 --- a/tooling/static/tests/common.h +++ b/tooling/static/tests/common.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,8 @@ #ifndef PANDA_TOOLING_INSPECTOR_TEST_COMMON_H #define PANDA_TOOLING_INSPECTOR_TEST_COMMON_H -#include "utils/json_builder.h" -#include "utils/json_parser.h" +#include "libarkbase/utils/json_builder.h" +#include "libarkbase/utils/json_parser.h" namespace ark::tooling::inspector::test { template diff --git a/tooling/static/tests/inspector_server.cpp b/tooling/static/tests/inspector_server.cpp index 9eeefa86..60e444d1 100644 --- a/tooling/static/tests/inspector_server.cpp +++ b/tooling/static/tests/inspector_server.cpp @@ -22,7 +22,7 @@ #include "assembly-parser.h" #include "runtime.h" #include "types/location.h" -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" #include "connection/server.h" diff --git a/tooling/static/tests/json_object_matcher.h b/tooling/static/tests/json_object_matcher.h index e6fb9bcf..4211ec8c 100644 --- a/tooling/static/tests/json_object_matcher.h +++ b/tooling/static/tests/json_object_matcher.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -27,8 +27,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "macros.h" -#include "utils/json_parser.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/json_parser.h" // NOLINTBEGIN diff --git a/tooling/static/tests/test_frame.h b/tooling/static/tests/test_frame.h index 74160a65..2752e928 100644 --- a/tooling/static/tests/test_frame.h +++ b/tooling/static/tests/test_frame.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,8 +23,8 @@ #include "include/method.h" #include "include/tooling/debug_interface.h" #include "include/tooling/pt_thread.h" -#include "macros.h" -#include "utils/list.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/list.h" // NOLINTBEGIN diff --git a/tooling/static/types/custom_url_breakpoint_response.cpp b/tooling/static/types/custom_url_breakpoint_response.cpp index a9c5c7e4..6069e8a0 100644 --- a/tooling/static/types/custom_url_breakpoint_response.cpp +++ b/tooling/static/types/custom_url_breakpoint_response.cpp @@ -15,7 +15,7 @@ #include "types/custom_url_breakpoint_response.h" -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" namespace ark::tooling::inspector { diff --git a/tooling/static/types/custom_url_breakpoint_response.h b/tooling/static/types/custom_url_breakpoint_response.h index 3a4090c4..377fa4b3 100644 --- a/tooling/static/types/custom_url_breakpoint_response.h +++ b/tooling/static/types/custom_url_breakpoint_response.h @@ -20,7 +20,7 @@ #include -#include "macros.h" +#include "libarkbase/macros.h" #include "types/numeric_id.h" diff --git a/tooling/static/types/debugger_call_function_on_request.cpp b/tooling/static/types/debugger_call_function_on_request.cpp index d1242a2c..ea4a556f 100644 --- a/tooling/static/types/debugger_call_function_on_request.cpp +++ b/tooling/static/types/debugger_call_function_on_request.cpp @@ -14,7 +14,7 @@ */ #include "types/debugger_call_function_on_request.h" -#include "utils/json_parser.h" +#include "libarkbase/utils/json_parser.h" #include "types/numeric_id.h" diff --git a/tooling/static/types/debugger_call_function_on_request.h b/tooling/static/types/debugger_call_function_on_request.h index 4fb58ddf..c0fe0500 100644 --- a/tooling/static/types/debugger_call_function_on_request.h +++ b/tooling/static/types/debugger_call_function_on_request.h @@ -16,8 +16,8 @@ #ifndef PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_CALL_FUNCTION_ON_REQUEST_H #define PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_CALL_FUNCTION_ON_REQUEST_H -#include "macros.h" -#include "utils/expected.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/expected.h" namespace ark { class JsonObject; diff --git a/tooling/static/types/debugger_evaluation_request.cpp b/tooling/static/types/debugger_evaluation_request.cpp index 7a846714..2943e28e 100644 --- a/tooling/static/types/debugger_evaluation_request.cpp +++ b/tooling/static/types/debugger_evaluation_request.cpp @@ -15,7 +15,7 @@ #include "types/debugger_evaluation_request.h" -#include "utils/json_parser.h" +#include "libarkbase/utils/json_parser.h" #include "types/numeric_id.h" diff --git a/tooling/static/types/debugger_evaluation_request.h b/tooling/static/types/debugger_evaluation_request.h index 1e2c6efc..3cc6b73c 100644 --- a/tooling/static/types/debugger_evaluation_request.h +++ b/tooling/static/types/debugger_evaluation_request.h @@ -16,8 +16,8 @@ #ifndef PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_EVALUATION_REQUEST_H #define PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_EVALUATION_REQUEST_H -#include "macros.h" -#include "utils/expected.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/expected.h" namespace ark { class JsonObject; diff --git a/tooling/static/types/evaluation_result.h b/tooling/static/types/evaluation_result.h index 0f40ea45..0b143e09 100644 --- a/tooling/static/types/evaluation_result.h +++ b/tooling/static/types/evaluation_result.h @@ -18,8 +18,8 @@ #include "json_serialization/serializable.h" -#include "macros.h" -#include "utils/json_builder.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/json_builder.h" #include "types/exception_details.h" #include "types/remote_object.h" diff --git a/tooling/static/types/exception_details.cpp b/tooling/static/types/exception_details.cpp index ab414615..491e906f 100644 --- a/tooling/static/types/exception_details.cpp +++ b/tooling/static/types/exception_details.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +15,7 @@ #include "types/exception_details.h" -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" namespace ark::tooling::inspector { diff --git a/tooling/static/types/exception_details.h b/tooling/static/types/exception_details.h index 24edac01..e515e836 100644 --- a/tooling/static/types/exception_details.h +++ b/tooling/static/types/exception_details.h @@ -20,7 +20,7 @@ #include #include -#include "macros.h" +#include "libarkbase/macros.h" #include "types/numeric_id.h" #include "types/remote_object.h" diff --git a/tooling/static/types/location.cpp b/tooling/static/types/location.cpp index 3f6fbde9..b1e256fc 100644 --- a/tooling/static/types/location.cpp +++ b/tooling/static/types/location.cpp @@ -19,9 +19,9 @@ #include #include -#include "utils/expected.h" -#include "utils/json_builder.h" -#include "utils/json_parser.h" +#include "libarkbase/utils/expected.h" +#include "libarkbase/utils/json_builder.h" +#include "libarkbase/utils/json_parser.h" #include "types/numeric_id.h" diff --git a/tooling/static/types/location.h b/tooling/static/types/location.h index 44083977..4c846a79 100644 --- a/tooling/static/types/location.h +++ b/tooling/static/types/location.h @@ -22,7 +22,7 @@ #include #include -#include "utils/expected.h" +#include "libarkbase/utils/expected.h" #include "types/numeric_id.h" diff --git a/tooling/static/types/numeric_id.h b/tooling/static/types/numeric_id.h index 53f5c5f5..385560b1 100644 --- a/tooling/static/types/numeric_id.h +++ b/tooling/static/types/numeric_id.h @@ -24,9 +24,9 @@ #include #include -#include "utils/expected.h" -#include "utils/json_parser.h" -#include "utils/string_helpers.h" +#include "libarkbase/utils/expected.h" +#include "libarkbase/utils/json_parser.h" +#include "libarkbase/utils/string_helpers.h" namespace ark::tooling::inspector { using BreakpointId = size_t; diff --git a/tooling/static/types/object_preview.cpp b/tooling/static/types/object_preview.cpp index 8561d65d..03aab802 100644 --- a/tooling/static/types/object_preview.cpp +++ b/tooling/static/types/object_preview.cpp @@ -16,7 +16,7 @@ #include "types/object_preview.h" #include "types/property_descriptor.h" -#include "utils/string_helpers.h" +#include "libarkbase/utils/string_helpers.h" namespace ark::tooling::inspector { diff --git a/tooling/static/types/possible_breakpoints_response.h b/tooling/static/types/possible_breakpoints_response.h index 582716f4..09aefb40 100644 --- a/tooling/static/types/possible_breakpoints_response.h +++ b/tooling/static/types/possible_breakpoints_response.h @@ -18,7 +18,7 @@ #include "json_serialization/serializable.h" -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" #include "types/location.h" diff --git a/tooling/static/types/profile_result.h b/tooling/static/types/profile_result.h index f03de7ac..f039b8ca 100644 --- a/tooling/static/types/profile_result.h +++ b/tooling/static/types/profile_result.h @@ -18,7 +18,7 @@ #include "json_serialization/serializable.h" #include "runtime/tooling/sampler/samples_record.h" -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" namespace ark::tooling::inspector { class Profile final : public JsonSerializable { diff --git a/tooling/static/types/property_descriptor.h b/tooling/static/types/property_descriptor.h index 2be39438..b784b54a 100644 --- a/tooling/static/types/property_descriptor.h +++ b/tooling/static/types/property_descriptor.h @@ -16,7 +16,7 @@ #ifndef PANDA_TOOLING_INSPECTOR_TYPES_PROPERTY_DESCRIPTOR_H #define PANDA_TOOLING_INSPECTOR_TYPES_PROPERTY_DESCRIPTOR_H -#include "macros.h" +#include "libarkbase/macros.h" #include "types/remote_object.h" #include "json_serialization/serializable.h" diff --git a/tooling/static/types/remote_object.cpp b/tooling/static/types/remote_object.cpp index 268d0349..b6433ba6 100644 --- a/tooling/static/types/remote_object.cpp +++ b/tooling/static/types/remote_object.cpp @@ -25,8 +25,8 @@ #include #include "libarkfile/helpers.h" -#include "macros.h" -#include "utils/json_builder.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/json_builder.h" #include "types/object_preview.h" #include "types/property_descriptor.h" diff --git a/tooling/static/types/remote_object_type.h b/tooling/static/types/remote_object_type.h index 9cc97904..c495fd56 100644 --- a/tooling/static/types/remote_object_type.h +++ b/tooling/static/types/remote_object_type.h @@ -16,7 +16,7 @@ #ifndef PANDA_TOOLING_INSPECTOR_TYPES_REMOTE_OBJECT_TYPE_H #define PANDA_TOOLING_INSPECTOR_TYPES_REMOTE_OBJECT_TYPE_H -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" #include "types/numeric_id.h" #include "json_serialization/serializable.h" diff --git a/tooling/static/types/scope.cpp b/tooling/static/types/scope.cpp index 200baf93..f7d33d0f 100644 --- a/tooling/static/types/scope.cpp +++ b/tooling/static/types/scope.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +15,7 @@ #include "types/scope.h" -#include "libpandabase/utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" namespace ark::tooling::inspector { static const char *GetTypeString(Scope::Type type) diff --git a/tooling/static/types/script_source_response.h b/tooling/static/types/script_source_response.h index 32c4486e..72bf18bd 100644 --- a/tooling/static/types/script_source_response.h +++ b/tooling/static/types/script_source_response.h @@ -18,8 +18,8 @@ #include "json_serialization/serializable.h" -#include "macros.h" -#include "utils/json_builder.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/json_builder.h" namespace ark::tooling::inspector { diff --git a/tooling/static/types/url_breakpoint_request.cpp b/tooling/static/types/url_breakpoint_request.cpp index 1f147984..ca909681 100644 --- a/tooling/static/types/url_breakpoint_request.cpp +++ b/tooling/static/types/url_breakpoint_request.cpp @@ -18,7 +18,7 @@ #include #include -#include "utils/json_parser.h" +#include "libarkbase/utils/json_parser.h" #include "types/numeric_id.h" diff --git a/tooling/static/types/url_breakpoint_request.h b/tooling/static/types/url_breakpoint_request.h index 35074ecf..65648d09 100644 --- a/tooling/static/types/url_breakpoint_request.h +++ b/tooling/static/types/url_breakpoint_request.h @@ -18,8 +18,8 @@ #include -#include "macros.h" -#include "utils/expected.h" +#include "libarkbase/macros.h" +#include "libarkbase/utils/expected.h" namespace ark { class JsonObject; diff --git a/tooling/static/types/url_breakpoint_response.cpp b/tooling/static/types/url_breakpoint_response.cpp index 56e423cf..948d8b9f 100644 --- a/tooling/static/types/url_breakpoint_response.cpp +++ b/tooling/static/types/url_breakpoint_response.cpp @@ -15,7 +15,7 @@ #include "types/url_breakpoint_response.h" -#include "utils/json_builder.h" +#include "libarkbase/utils/json_builder.h" #include "types/custom_url_breakpoint_response.h" diff --git a/tooling/static/types/url_breakpoint_response.h b/tooling/static/types/url_breakpoint_response.h index 9985a820..7b6fead3 100644 --- a/tooling/static/types/url_breakpoint_response.h +++ b/tooling/static/types/url_breakpoint_response.h @@ -20,7 +20,7 @@ #include -#include "macros.h" +#include "libarkbase/macros.h" #include "types/location.h" #include "types/numeric_id.h" -- Gitee