tyler.durden/snappy-java
1
0
Fork 0
mirror of https://github.com/xerial/snappy-java.git synced 2025-04-08 19:35:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #198 from xerial/fix-android-folder-name

Browse Source 
#174: Fix folder name for android
This commit is contained in:
Taro L. Saito 2017-12-07 11:47:24 -08:00 committed by GitHub
commit 705f94997b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Makefile Normal file
View File

@ -0,0 +1,6 @@
centos5-image:
docker build -f Dockerfile.centos5-linux-x86_64-pic -t xerial/centos5-linux-x86_64:latest
# dockerhub login
# docker login --username=xerial
# docker push xerial/centos5-linux-x86_64:latest

5
src/main/java/org/xerial/snappy/OSInfo.java
View File

@ -204,9 +204,10 @@ public class OSInfo {
String osArch = System.getProperty("os.arch");
// For Android
if(isAndroid()) {
osArch = "android-arm";
return "android-arm";
}
else if(osArch.startsWith("arm")) {
if(osArch.startsWith("arm")) {
osArch = resolveArmArchType();
}
else {

2
version.sbt
View File

@ -1 +1 @@
version in ThisBuild := "1.1.8-SNAPSHOT"
version in ThisBuild := "1.1.7.1-SNAPSHOT"