diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn index 60c32ea888d672fd753514e638086c66492cc36b..e522272347991ef149899997416b96a56034af3a 100644 --- a/ets2panda/BUILD.gn +++ b/ets2panda/BUILD.gn @@ -1155,7 +1155,7 @@ if (ark_standalone_build || ark_static_standalone_build) { libes2panda_configs += [ "$ark_root/assembler:arkassembler_public_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/abc2program:arkts_abc2program_public_config", ] } @@ -1169,7 +1169,7 @@ if (ark_standalone_build || ark_static_standalone_build) { libes2panda_public_configs += [ "$ark_root/assembler:arkassembler_public_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/bytecode_optimizer:bytecodeopt_public_config", "$ark_root/runtime:arkruntime_public_config", "$ark_root/compiler:arkcompiler_public_config", @@ -1288,7 +1288,7 @@ ohos_source_set("libes2panda_public_frontend_static") { "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package", "$ark_root/compiler:libarktscompiler", "$ark_root/libpandabase:libarktsbase", - "$ark_root/libpandafile:libarktsfile", + "$ark_root/libarkfile:libarktsfile", ] } else { external_deps += [ diff --git a/ets2panda/aot/BUILD.gn b/ets2panda/aot/BUILD.gn index a3a533b320f2393e94521c43ace7559dde162b22..55f5f3e98d6100c3bdcf6e7ecf99ae3ec4c8c81c 100644 --- a/ets2panda/aot/BUILD.gn +++ b/ets2panda/aot/BUILD.gn @@ -44,7 +44,7 @@ ohos_executable("ets2panda") { if (ark_standalone_build || ark_static_standalone_build) { configs += [ "$ark_root/assembler:arkassembler_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/bytecode_optimizer:bytecodeopt_public_config", "$ark_root/runtime:arkruntime_public_config", @@ -65,7 +65,7 @@ ohos_executable("ets2panda") { deps += [ "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package", "$ark_root/libpandabase:libarktsbase_package", - "$ark_root/libpandafile:libarktsfile_package", + "$ark_root/libarkfile:libarktsfile_package", ] } diff --git a/ets2panda/bindings/BUILD.gn b/ets2panda/bindings/BUILD.gn index a6f48462abf2b042df65d9c0eefb692587a09565..a51c47c5d1b0b475bfee2228e0393349749c72b4 100644 --- a/ets2panda/bindings/BUILD.gn +++ b/ets2panda/bindings/BUILD.gn @@ -46,7 +46,7 @@ shared_library("ts_bindings") { "../:libes2panda_public_config", "../:libes2panda_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", ] deps = [ @@ -207,7 +207,7 @@ shared_library("public") { "../:libes2panda_public_config", "../:libes2panda_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", ] include_dirs = [ diff --git a/ets2panda/declgen_ets2ts/BUILD.gn b/ets2panda/declgen_ets2ts/BUILD.gn index 8cc3dabeefbebe8fcf39fd6acfec1e2d60410661..6fdca2dbfb45ed3f26ba8ca3421a2dc8248957aa 100644 --- a/ets2panda/declgen_ets2ts/BUILD.gn +++ b/ets2panda/declgen_ets2ts/BUILD.gn @@ -39,7 +39,7 @@ ohos_executable("declgen_ets2ts") { configs += [ "$ark_es2panda_root:libes2panda_public_config", "$ark_root/assembler:arkassembler_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/bytecode_optimizer:bytecodeopt_public_config", "$ark_root/compiler:arkcompiler_public_config", diff --git a/ets2panda/driver/dependency_analyzer/BUILD.gn b/ets2panda/driver/dependency_analyzer/BUILD.gn index 96449c6f58f2857eb8680f52e26b965dcf87d023..fd2530fddc445bf8a022bdae8057190ec2d0271e 100644 --- a/ets2panda/driver/dependency_analyzer/BUILD.gn +++ b/ets2panda/driver/dependency_analyzer/BUILD.gn @@ -46,7 +46,7 @@ ohos_executable("dependency_analyzer") { deps += [ "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package", "$ark_root/libpandabase:libarktsbase_package", - "$ark_root/libpandafile:libarktsfile_package", + "$ark_root/libarkfile:libarktsfile_package", ] } diff --git a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp index e1101e2b0037ff38a6ab9cb79ec45a030dfd40cd..df3118e7b677a4a5fbbbc15407c44cd653c433e7 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp @@ -18,9 +18,9 @@ #include "checker/ETSchecker.h" #include "ir/statements/classDeclaration.h" #include "ir/expressions/identifier.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/file-inl.h" -#include "libpandafile/method_data_accessor.h" +#include "libarkfile/class_data_accessor-inl.h" +#include "libarkfile/file-inl.h" +#include "libarkfile/method_data_accessor.h" #include "evaluate/helpers.h" #include "evaluate/debugInfoDeserialization/methodBuilder.h" diff --git a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp index a84486f5f567b7e080eeafcdeab88898375dce46..d9bfbbee6f9c2b2b9ed133b9b3ce1882845097c5 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp @@ -29,8 +29,8 @@ #include "compiler/lowering/scopesInit/scopesInitPhase.h" #include "compiler/lowering/util.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/class_data_accessor-inl.h" +#include "libarkfile/file-inl.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h index fe5e9ac7d38d534a0d016ac881f0e619639ff43e..d2035a6d6d79c436158534a2b841586dd77cda8d 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h +++ b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h @@ -17,8 +17,8 @@ #define ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H #include "libpandabase/utils/arena_containers.h" -#include "libpandafile/debug_info_extractor.h" -#include "libpandafile/file.h" +#include "libarkfile/debug_info_extractor.h" +#include "libarkfile/file.h" namespace ark::es2panda::varbinder { class Variable; diff --git a/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp b/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp index 1e82b52cc2d5e04cd93bf2e04c5290e65de23305..586bbb08f060fe3cbb19494ece3293966e7163ad 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp @@ -22,8 +22,8 @@ #include "evaluate/proxyProgramsCache.h" #include "evaluate/entityDeclarator-inl.h" -#include "libpandafile/class_data_accessor.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/class_data_accessor.h" +#include "libarkfile/file-inl.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp index a2326cba1b3554b7b0424dfd1197199cc751f662..574f543e1cccbe251c0156c9992baccd3085d9d3 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp @@ -15,9 +15,9 @@ #include "evaluate/debugInfoDeserialization/methodBuilder.h" #include "checker/ETSchecker.h" -#include "libpandafile/file-inl.h" -#include "libpandafile/method_data_accessor-inl.h" -#include "libpandafile/proto_data_accessor-inl.h" +#include "libarkfile/file-inl.h" +#include "libarkfile/method_data_accessor-inl.h" +#include "libarkfile/proto_data_accessor-inl.h" #include "evaluate/helpers.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoStorage.cpp b/ets2panda/evaluate/debugInfoStorage.cpp index 20163df7651cfe096002170d3259eedeb67bb862..b1f0f03d2931f24b11ad592d6bbc2a66023966cf 100644 --- a/ets2panda/evaluate/debugInfoStorage.cpp +++ b/ets2panda/evaluate/debugInfoStorage.cpp @@ -18,8 +18,8 @@ #include "generated/signatures.h" #include "evaluate/helpers.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/class_data_accessor-inl.h" +#include "libarkfile/file-inl.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoStorage.h b/ets2panda/evaluate/debugInfoStorage.h index 43966dca6b0ff74b13dc79db3d14776c48b1797d..bffdd2f8cc10e1682b6ff70ea34db4009f9adc9c 100644 --- a/ets2panda/evaluate/debugInfoStorage.h +++ b/ets2panda/evaluate/debugInfoStorage.h @@ -20,9 +20,9 @@ #include "evaluate/importExportTable.h" #include "util/ustring.h" -#include "libpandafile/debug_info_extractor.h" -#include "libpandafile/file.h" -#include "libpandafile/class_data_accessor.h" +#include "libarkfile/debug_info_extractor.h" +#include "libarkfile/file.h" +#include "libarkfile/class_data_accessor.h" #include #include diff --git a/ets2panda/evaluate/evaluateContext.h b/ets2panda/evaluate/evaluateContext.h index 848719954f6edb5ae62a15d6b74a3640109257e4..3365e558e198c929f7ccbdfdff407d9c416ab78b 100644 --- a/ets2panda/evaluate/evaluateContext.h +++ b/ets2panda/evaluate/evaluateContext.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 "util/options.h" #include "libpandabase/utils/arena_containers.h" -#include "libpandafile/debug_info_extractor.h" -#include "libpandafile/file.h" +#include "libarkfile/debug_info_extractor.h" +#include "libarkfile/file.h" #include #include diff --git a/ets2panda/evaluate/helpers.cpp b/ets2panda/evaluate/helpers.cpp index e41daa9022fdf3ae4d7e28f6a1c249b8192d03af..88a631b2f782a80548f9b7e16ad7cd09951a48f8 100644 --- a/ets2panda/evaluate/helpers.cpp +++ b/ets2panda/evaluate/helpers.cpp @@ -24,8 +24,8 @@ #include "ir/typeNode.h" #include "assembler/assembly-type.h" -#include "libpandafile/field_data_accessor-inl.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/field_data_accessor-inl.h" +#include "libarkfile/file-inl.h" #include #include diff --git a/ets2panda/evaluate/helpers.h b/ets2panda/evaluate/helpers.h index dd4766d19c0d7b751bbaefa2e06dc22943ab0d34..5038bcc9ac87d1dd69e2695c24ae86cff9107b1f 100644 --- a/ets2panda/evaluate/helpers.h +++ b/ets2panda/evaluate/helpers.h @@ -21,11 +21,11 @@ #include "ir/astNodeFlags.h" #include "varbinder/ETSBinder.h" -#include "libpandafile/field_data_accessor.h" -#include "libpandafile/method_data_accessor.h" -#include "libpandafile/class_data_accessor.h" -#include "libpandafile/file.h" -#include "type.h" +#include "libarkfile/field_data_accessor.h" +#include "libarkfile/method_data_accessor.h" +#include "libarkfile/class_data_accessor.h" +#include "libarkfile/file.h" +#include #include #include diff --git a/ets2panda/lsp/BUILD.gn b/ets2panda/lsp/BUILD.gn index 4c7e5927d8fccacbb9369b5ff82f4b68f1b702c8..d75bb4419fc6460f93bce8394ec153ebc3293fe4 100644 --- a/ets2panda/lsp/BUILD.gn +++ b/ets2panda/lsp/BUILD.gn @@ -120,7 +120,7 @@ ohos_source_set("libes2panda_lsp_static") { "../:libes2panda_public_config", "../:libes2panda_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", ":libes2panda_lsp_config", ] diff --git a/ets2panda/test/unit/declgen/CMakeLists.txt b/ets2panda/test/unit/declgen/CMakeLists.txt index 37a9cc4496602a461275cc95dfa8360f69b0d5f3..1e0cab0b035f78f620b5cfed4e1864175eb6d50c 100644 --- a/ets2panda/test/unit/declgen/CMakeLists.txt +++ b/ets2panda/test/unit/declgen/CMakeLists.txt @@ -43,7 +43,6 @@ foreach(TEST_DATA IN ITEMS ${DECLGEN_PLUGIN_TESTS}) panda_target_include_directories(${TEST_NAME} PRIVATE ${ES2PANDA_PATH} - PRIVATE ${PANDA_ROOT}/libpandafile PRIVATE ${PANDA_ROOT}/assembler PRIVATE ${OUTPUT_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} @@ -51,7 +50,6 @@ foreach(TEST_DATA IN ITEMS ${DECLGEN_PLUGIN_TESTS}) PUBLIC ${CMAKE_SOURCE_DIR}/libpandabase PUBLIC ${CMAKE_SOURCE_DIR}/runtime PUBLIC ${CMAKE_BINARY_DIR}/libpandabase - PUBLIC ${CMAKE_BINARY_DIR}/libpandafile/include ${CMAKE_BINARY_DIR} ) panda_target_link_libraries(${TEST_NAME} es2panda-public arkassembler arkbase arkfile)