diff --git a/BUILD.gn b/BUILD.gn index 99493462a51cf03e999cd063648eef2dc5dd10d9..610c1c322e0bc90674a045bfef46e116d25b6bf6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -13,10 +13,6 @@ import("//build/ohos.gni") -config("elfio_public_config") { - include_dirs = [ "//third_party/elfio/elfio" ] -} - ohos_shared_library("elfio") { sources = [ "./c_wrapper/elfio_c_wrapper.cpp", @@ -30,8 +26,6 @@ ohos_shared_library("elfio") { "./", ] - public_configs = [ ":elfio_public_config" ] - license_file = "//third_party/elfio/LICENSE.txt" subsystem_name = "thirdparty" diff --git a/bundle.json b/bundle.json index 8cd46ae55b005d4d3467b53d61d8c041f9f49baa..56a9bb7d440622347c86be070d22ec5d9fa0400b 100644 --- a/bundle.json +++ b/bundle.json @@ -26,16 +26,8 @@ }, "build": { "sub_component": [], - "inner_kits": [ - { - "name": "//third_party/elfio:elfio", - "header": { - "header_files": [], - "header_base": "//third_party/elfio/elfio" - } - } - ], + "inner_kits": [], "test": [] } } -} \ No newline at end of file +} diff --git a/elfio/elfio.hpp b/elfio/elfio.hpp index 74d515cf04d495cc11b51ce2d37b617f812e040b..1761b7020e58a37c64f67726580a06d512b2e119 100644 --- a/elfio/elfio.hpp +++ b/elfio/elfio.hpp @@ -33,13 +33,13 @@ THE SOFTWARE. #include #include -#include "elf_types.hpp" -#include "elfio_version.hpp" -#include "elfio_utils.hpp" -#include "elfio_header.hpp" -#include "elfio_section.hpp" -#include "elfio_segment.hpp" -#include "elfio_strings.hpp" +#include +#include +#include +#include +#include +#include +#include #define ELFIO_HEADER_ACCESS_GET( TYPE, FNAME ) \ TYPE get_##FNAME() const noexcept \ @@ -1105,12 +1105,12 @@ class elfio } // namespace ELFIO -#include "elfio_symbols.hpp" -#include "elfio_note.hpp" -#include "elfio_relocation.hpp" -#include "elfio_dynamic.hpp" -#include "elfio_array.hpp" -#include "elfio_modinfo.hpp" -#include "elfio_versym.hpp" +#include +#include +#include +#include +#include +#include +#include #endif // ELFIO_HPP