Skip to content

feat: Added aarch64 native library #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolatimeus merged 7 commits into from
May 5, 2022
Merged

feat: Added aarch64 native library #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e524796
build: upticked version to 1.0.3-SNAPSHOT
nicolatimeus May 4, 2022
6c3c8fb
build: Imported native libs from version 1.0.2
nicolatimeus May 4, 2022
49f9e6f
build: added native lib for aarch64
nicolatimeus May 4, 2022
42393cc
build: removed armv6_hf library with wrong path
nicolatimeus May 4, 2022
6cd8fad
fix: updated library loading code
nicolatimeus May 4, 2022
39647d1
fix: Fix library load paths
nicolatimeus May 4, 2022
96a7bcd
build: Added source jar generation
nicolatimeus May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added lib/linux-32/libjni_socketcan.so
View file
Open in desktop
Binary file not shown.
Binary file added lib/linux-64/libjni_socketcan.so
View file
Open in desktop
Binary file not shown.
Binary file added lib/linux-arm/libjni_socketcan.so
View file
Open in desktop
Binary file not shown.
Binary file added lib/linux-arm64/libjni_socketcan.so
View file
Open in desktop
Binary file not shown.
Binary file removed lib/linux/armv6_hf/libjni_socketcan.so
View file
Open in desktop
Binary file not shown.
28 changes: 22 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>de.entropia</groupId>
<artifactId>libsocket-can-java</artifactId>
<name>libsocket-can-java</name>
<version>1.0.0</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>jar</packaging>


Expand All @@ -22,11 +22,27 @@
</resources>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
<configuration>
<includes>
<include>src/main/c/**/*</include>
<include>src/main/java/**/*</include>
</includes>
<excludes>
<exclude>**/*.so</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/de/entropia/can/CanSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,14 @@ public static void loadLibFromJar(String fileName) throws IOException {

String osType = System.getProperty("os.arch");
final String path;
if(osType.matches("arm")){
path = "/de/entropia/can/lib/linux-arm/lib" + fileName + ".so";
}
else{
path = "/de/entropia/can/lib/linux-32/lib" + fileName + ".so";
if (osType.equalsIgnoreCase("arm")){
path = "/lib/linux-arm/lib" + fileName + ".so";
} else if (osType.equalsIgnoreCase("x86")) {
path = "/lib/linux-32/lib" + fileName + ".so";
} else if (osType.equalsIgnoreCase("amd64")) {
path = "/lib/linux-64/lib" + fileName + ".so";
} else {
path = "/lib/linux-arm64/lib" + fileName + ".so";
}

// Obtain filename from path
Expand Down