diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index 836fba3f5cac14f92b58114a9234f04aaf2c3c3b..4b998592cacf9bd64ebee5ea2605839898cae414 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -27,12 +27,12 @@
<target name="check-native-build-mac" depends="testTSKLibs" if="tsk_dylib.present">
<uptodate property="native-up-to-date" srcfile="./jni/.libs/libtsk_jni.dylib"
- targetfile="${amd64}/mac/libtsk_jni.jnilib" />
+ targetfile="${x86_64}/mac/libtsk_jni.jnilib" />
</target>
<target name="check-native-build-unix" depends="testTSKLibs" if="tsk_so.present">
<uptodate property="native-up-to-date" srcfile="./jni/.libs/libtsk_jni.so"
- targetfile="${amd64}/linux/libtsk_jni.so"/>
+ targetfile="${x86_64}/linux/libtsk_jni.so"/>
</target>
<target name="testTSKLibs">
@@ -58,8 +58,6 @@
<property name="jni.jnilib" value="libtsk_jni.jnilib" />
<!-- x86_64 -->
<copy file="${jni.dylib}" tofile="${x86_64}/mac/${jni.jnilib}" overwrite="true"/>
- <!-- amd64 -->
- <copy file="${jni.dylib}" tofile="${amd64}/mac/${jni.jnilib}" overwrite="true"/>
</target>
<!-- Non-OS X -->
@@ -75,16 +73,8 @@
<property name="libewf.so" location="${lib.ewf.path}/libewf.so"/>
<!-- x86_64 -->
<copy file="${jni.so}" tofile="${x86_64}/linux/libtsk_jni.so" overwrite="true"/>
- <!-- amd64 -->
- <copy file="${jni.so}" tofile="${amd64}/linux/libtsk_jni.so" overwrite="true"/>
<!-- x86 -->
<copy file="${jni.so}" tofile="${x86}/linux/libtsk_jni.so" overwrite="true"/>
- <!-- i386 -->
- <copy file="${jni.so}" tofile="${i386}/linux/libtsk_jni.so" overwrite="true"/>
- <!-- i586 -->
- <copy file="${jni.so}" tofile="${i586}/linux/libtsk_jni.so" overwrite="true"/>
- <!-- i686 -->
- <copy file="${jni.so}" tofile="${i686}/linux/libtsk_jni.so" overwrite="true"/>
</target>
<target name="copyLibs-SQLite" depends="copyLinuxLibs,copyMacLibs" />
diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml
index dcc395f5da3455214bda694a04fcf72b69141ebf..d93e2be078d5b7112ad140a7294f32bf51cc2c1d 100644
--- a/bindings/java/build-windows.xml
+++ b/bindings/java/build-windows.xml
@@ -37,7 +37,7 @@
<target name="check-build-64" if="win64.TskLib.exists">
<uptodate property="native-up-to-date" srcfile="${basedir}/../../win32/x64/Release/libtsk_jni.dll"
- targetfile="${amd64}/win/libtsk_jni.dll"/>
+ targetfile="${x86_64}/win/libtsk_jni.dll"/>
</target>
<target name="copyLibs-SQLite" description="Copy native libs to the correct folder">
@@ -70,17 +70,13 @@
<target name="copyWinTskLibs64ToBuildSQLite" depends="checkTskLibDirsSQLite" if="win64.TskLib.exists">
<property name="tsk.jni.64" location="${basedir}/../../win32/x64/${tsk.config}/libtsk_jni.dll" />
- <copy file="${tsk.jni.64}" todir="${amd64}/win" overwrite="true"/>
<copy file="${tsk.jni.64}" todir="${x86_64}/win" overwrite="true"/>
</target>
<target name="copyWinTskLibs32ToBuild-SQLite" depends="checkTskLibDirs" if="win32.TskLib.exists">
<property name="tsk.jni.32" location="${basedir}/../../win32/${tsk.config}/libtsk_jni.dll" />
- <copy file="${tsk.jni.32}" todir="${i386}/win" overwrite="true"/>
<copy file="${tsk.jni.32}" todir="${x86}/win" overwrite="true"/>
- <copy file="${tsk.jni.32}" todir="${i586}/win" overwrite="true"/>
- <copy file="${tsk.jni.32}" todir="${i686}/win" overwrite="true"/>
</target>
<target name="copyWinTskLibsToBuild-PostgreSQL" depends="copyWinTskLibs64ToBuild-PostgreSQL,copyWinTskLibs32ToBuild-PostgreSQL" description="Copy Windows DLLs to the correct location, PostgreSQL build." />
@@ -93,16 +89,12 @@
<target name="copyWinTskLibs64ToBuild-PostgreSQL" depends="checkTskLibDirs" if="win64.TskLib.exists">
<property name="tsk.jni.64" location="${basedir}/../../win32/x64/${tsk.config}/libtsk_jni.dll" />
- <copy file="${tsk.jni.64}" todir="${amd64}/win" overwrite="true"/>
<copy file="${tsk.jni.64}" todir="${x86_64}/win" overwrite="true"/>
</target>
<target name="copyWinTskLibs32ToBuild-PostgreSQL" depends="checkTskLibDirs" if="win32.TskLib.exists">
<property name="tsk.jni.32" location="${basedir}/../../win32/${tsk.config}/libtsk_jni.dll" />
- <copy file="${tsk.jni.32}" todir="${i386}/win" overwrite="true"/>
<copy file="${tsk.jni.32}" todir="${x86}/win" overwrite="true"/>
- <copy file="${tsk.jni.32}" todir="${i586}/win" overwrite="true"/>
- <copy file="${tsk.jni.32}" todir="${i686}/win" overwrite="true"/>
</target>
</project>
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index 8fb0673544fa5c33fa034a1980284e93c53d3252..3952e738fcd1486f8542df8a9b86bacc2d1570ab 100755
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -23,12 +23,8 @@
<property name="test-input" location="test/input"/>
<property name="test-types" location="test/org/sleuthkit/datamodel"/>
<property name="native-libs" location="build/NATIVELIBS" />
- <property name="amd64" location="build/NATIVELIBS/amd64" />
<property name="x86" location="build/NATIVELIBS/x86" />
<property name="x86_64" location="build/NATIVELIBS/x86_64" />
- <property name="i386" location="build/NATIVELIBS/i386" />
- <property name="i586" location="build/NATIVELIBS/i586" />
- <property name="i686" location="build/NATIVELIBS/i686"/>
<path id="libraries">
<fileset dir="${lib}">
@@ -37,7 +33,6 @@
<pathelement path="${build}"/>
</path>
- <!-- Only added win folders for now -->
<target name="init">
<mkdir dir="${build}"/>
<mkdir dir="${dist}"/>
@@ -46,10 +41,6 @@
<mkdir dir="${test-standards}"/>
<mkdir dir="${test-results}"/>
<mkdir dir="${native-libs}" />
- <mkdir dir="${amd64}" />
- <mkdir dir="${amd64}/win" />
- <mkdir dir="${amd64}/mac" />
- <mkdir dir="${amd64}/linux" />
<mkdir dir="${x86}" />
<mkdir dir="${x86}/win" />
<mkdir dir="${x86}/linux" />
@@ -57,15 +48,6 @@
<mkdir dir="${x86_64}/win" />
<mkdir dir="${x86_64}/mac" />
<mkdir dir="${x86_64}/linux"/>
- <mkdir dir="${i386}" />
- <mkdir dir="${i386}/win" />
- <mkdir dir="${i386}/linux"/>
- <mkdir dir="${i586}" />
- <mkdir dir="${i586}/win" />
- <mkdir dir="${i586}/linux" />
- <mkdir dir="${i686}"/>
- <mkdir dir="${i686}/win"/>
- <mkdir dir="${i686}/linux"/>
</target>
<property name="ivy.install.version" value="2.3.0-rc2" />
diff --git a/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java b/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java
index 5249bf28d9c76976fe26ebacc546ab111458d88c..f32163f95ad7628f67821775b1f913262a247a51 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java
@@ -92,7 +92,7 @@ private static String getPlatform() {
os = "linux"; //NON-NLS
}
// os.arch represents the architecture of the JVM, not the os
- String arch = System.getProperty("os.arch");
+ String arch = System.getProperty("os.arch").endsWith("64") ? "x86_64" : "x86";
return arch.toLowerCase() + "/" + os.toLowerCase();
}