From 1a0e2c6859f07e997e6ed9b8c463c98f33548f5d Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 16:31:33 +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 | 3 ++- bundle.json | 3 ++- elfio/elfio.hpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9949346..1885b53 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -8,7 +8,8 @@ # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# See the + License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") diff --git a/bundle.json b/bundle.json index 8cd46ae..a6e3eba 100644 --- a/bundle.json +++ b/bundle.json @@ -9,7 +9,8 @@ }, "dirs": {}, "scripts": {}, - "licensePath": "LICENSE.txt", + "lic + ensePath": "LICENSE.txt", "component": { "name": "elfio", "subsystem": "thirdparty", diff --git a/elfio/elfio.hpp b/elfio/elfio.hpp index 74d515c..6cf53a0 100644 --- a/elfio/elfio.hpp +++ b/elfio/elfio.hpp @@ -8,6 +8,7 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -- Gitee From a1afe1efc52631521e2532dd0fcb4b10cf75031b Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 08:50:29 +0000 Subject: [PATCH 2/4] update BUILD.gn. Signed-off-by: cy --- BUILD.gn | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 1885b53..610c1c3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -8,16 +8,11 @@ # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the - License for the specific language governing permissions and +# See the License for the specific language governing permissions and # limitations under the License. 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 c7d64bd17bbc550b476b78dcaef8d59e2cad16b6 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 08:50:47 +0000 Subject: [PATCH 3/4] update bundle.json. Signed-off-by: cy --- bundle.json | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/bundle.json b/bundle.json index a6e3eba..56a9bb7 100644 --- a/bundle.json +++ b/bundle.json @@ -9,8 +9,7 @@ }, "dirs": {}, "scripts": {}, - "lic - ensePath": "LICENSE.txt", + "licensePath": "LICENSE.txt", "component": { "name": "elfio", "subsystem": "thirdparty", @@ -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 752b3fa601d418415e41a5d9ae33e6e42c7c9d42 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 08:51:05 +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 6cf53a0..1761b70 100644 --- a/elfio/elfio.hpp +++ b/elfio/elfio.hpp @@ -8,7 +8,6 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -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