From b6b0a73d7a008165ac3ea9bcde6a1f17c023c35b Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 25 Dec 2024 17:09:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cy --- BUILD.gn | 1 + bundle.json | 1 + elfio/elfio.hpp | 1 + 3 files changed, 3 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 9949346..0876bc6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1,4 +1,5 @@ # Copyright (c) 2022 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 diff --git a/bundle.json b/bundle.json index 8cd46ae..bdf61ec 100644 --- a/bundle.json +++ b/bundle.json @@ -1,4 +1,5 @@ { + "name": "@ohos/elfio", "description": "ELFIO is a small, header-only C++ library that provides a simple interface for reading and generating files in ELF binary format.", "version": "Release_3.9", diff --git a/elfio/elfio.hpp b/elfio/elfio.hpp index 74d515c..c0081f7 100644 --- a/elfio/elfio.hpp +++ b/elfio/elfio.hpp @@ -1,4 +1,5 @@ /* + Copyright (C) 2001-present by Serge Lamikhov-Center Permission is hereby granted, free of charge, to any person obtaining a copy -- Gitee From c362b7dbbf4b978c2f1d8e3e24f8114abc38d72d Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 27 Dec 2024 04:05:47 +0000 Subject: [PATCH 2/4] update BUILD.gn. Signed-off-by: cy --- BUILD.gn | 7 ------- 1 file changed, 7 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 0876bc6..610c1c3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1,5 +1,4 @@ # Copyright (c) 2022 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 @@ -14,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", @@ -31,8 +26,6 @@ ohos_shared_library("elfio") { "./", ] - public_configs = [ ":elfio_public_config" ] - license_file = "//third_party/elfio/LICENSE.txt" subsystem_name = "thirdparty" -- Gitee From f49a57ae83bea4a12c2c400e31d6a37418a4a70f Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 27 Dec 2024 04:06:17 +0000 Subject: [PATCH 3/4] update bundle.json. Signed-off-by: cy --- bundle.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/bundle.json b/bundle.json index bdf61ec..56a9bb7 100644 --- a/bundle.json +++ b/bundle.json @@ -1,5 +1,4 @@ { - "name": "@ohos/elfio", "description": "ELFIO is a small, header-only C++ library that provides a simple interface for reading and generating files in ELF binary format.", "version": "Release_3.9", @@ -27,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 +} -- Gitee From 834ee1af1e4781b8df5efa09c9be0ef7bf6d55f8 Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 27 Dec 2024 04:06:56 +0000 Subject: [PATCH 4/4] update elfio/elfio.hpp. Signed-off-by: cy --- elfio/elfio.hpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/elfio/elfio.hpp b/elfio/elfio.hpp index c0081f7..1761b70 100644 --- a/elfio/elfio.hpp +++ b/elfio/elfio.hpp @@ -1,5 +1,4 @@ /* - Copyright (C) 2001-present by Serge Lamikhov-Center Permission is hereby granted, free of charge, to any person obtaining a copy @@ -34,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 \ @@ -1106,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 -- Gitee