[skywalking-java] branch fix-netty-lib-relocation created (now 7dea4f22b)

[lu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lujiajing pushed a change to branch fix-netty-lib-relocation
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git


      at 7dea4f22b fix native lib relocation for aarch64

This branch includes the following new commits:

     new 7dea4f22b fix native lib relocation for aarch64

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[skywalking-java] 01/01: fix native lib relocation for aarch64

[lu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lujiajing pushed a commit to branch fix-netty-lib-relocation
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git

commit 7dea4f22bad1c936b85b9237ddde8b1ddeed014b
Author: Megrez Lu <lu...@gmail.com>
AuthorDate: Mon May 30 15:25:38 2022 +0800

    fix native lib relocation for aarch64
---
 apm-sniffer/apm-agent-core/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index ec4246823..f657a5dc9 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -251,6 +251,8 @@
                                 <echo message="unjar" />
                                 <unzip src="${project.build.directory}/${project.artifactId}-${project.version}.jar" dest="${project.build.directory}/unpacked/" />
                                 <echo message="rename service providers in META-INF/services" />
+                                <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_aarch_64.jnilib" />
+                                <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_aarch_64.so" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_aarch_64.so" />
                                 <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_x86_64.jnilib" />
                                 <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_x86_64.so" />
                                 <move file="${project.build.directory}/unpacked/META-INF/native/netty_tcnative_windows_x86_64.dll" tofile="${project.build.directory}/unpacked/META-INF/native/org_apache_skywalking_apm_dependencies_netty_tcnative_windows_x86_64.dll" />