diff --git a/android/settings.gradle b/android/settings.gradle
index dae077c0f6..4ce930619f 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -12,4 +12,8 @@ project(':models').projectDir = new File('../java_console/models')
 include ':autoupdate'
 project(':autoupdate').projectDir = new File('../java_console/autoupdate')
 include ':gcc_map_reader'
-project(':gcc_map_reader').projectDir = new File('../java_tools/gcc_map_reader')
\ No newline at end of file
+project(':gcc_map_reader').projectDir = new File('../java_tools/gcc_map_reader')
+include ':logicdata2c'
+project(':logicdata2c').projectDir = new File('../java_tools/logicdata2c')
+include ':version2header'
+project(':version2header').projectDir = new File('../java_tools/version2header')
\ No newline at end of file
diff --git a/java_tools/logicdata2c/build.gradle b/java_tools/logicdata2c/build.gradle
new file mode 100644
index 0000000000..978b0797d9
--- /dev/null
+++ b/java_tools/logicdata2c/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+    id 'java-library'
+}
+
+repositories {
+    mavenCentral()
+}
+
+defaultTasks 'jar'
+
+dependencies {
+    implementation 'junit:junit:4.8.2'
+}
+
+jar {
+    destinationDirectory = file( '$rootDir/../..' )
+    manifest {
+        attributes(
+            'Main-Class': 'com.rusefi.LogicData2C'
+        )
+    }
+}
\ No newline at end of file
diff --git a/java_tools/logicdata2c/build.xml b/java_tools/logicdata2c/build.xml
deleted file mode 100644
index 58fa298d3b..0000000000
--- a/java_tools/logicdata2c/build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project default="jar">
-
-    <target name="clean">
-        <delete dir="build"/>
-    </target>
-
-    <target name="compile">
-        <mkdir dir="build/classes"/>
-        <javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
-		<src path="src/main/java"/>
-	</javac>
-    </target>
-
-    <target name="jar" depends="compile">
-        <mkdir dir="build/jar"/>
-        <jar destfile="../logicdata2c.jar" basedir="build/classes">
-            <manifest>
-                <attribute name="Main-Class" value="com.rusefi.LogicData2C"/>
-            </manifest>
-		<zipfileset dir="build/classes" includes="**/*.class"/>
-        </jar>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/java_tools/version2header/build.gradle b/java_tools/version2header/build.gradle
new file mode 100644
index 0000000000..121f978c04
--- /dev/null
+++ b/java_tools/version2header/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+    id 'java-library'
+}
+
+repositories {
+    mavenCentral()
+}
+
+defaultTasks 'jar'
+
+dependencies {
+    implementation 'junit:junit:4.8.2'
+}
+
+jar {
+    destinationDirectory = file( '$rootDir/../..' )
+    manifest {
+        attributes(
+            'Main-Class': 'com.rusefi.Version2Header'
+        )
+    }
+}
\ No newline at end of file
diff --git a/java_tools/version2header/build.xml b/java_tools/version2header/build.xml
deleted file mode 100644
index 2f4f83dae1..0000000000
--- a/java_tools/version2header/build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project default="jar">
-
-    <target name="clean">
-        <delete dir="build"/>
-    </target>
-
-    <target name="compile">
-        <mkdir dir="build/classes"/>
-        <javac destdir="build/classes" classpath="lib/junit.jar:lib/annotations.jar">
-		<src path="src/main/java"/>
-	</javac>
-    </target>
-
-    <target name="jar" depends="compile">
-        <mkdir dir="build/jar"/>
-        <jar destfile="../version2header.jar" basedir="build/classes">
-            <manifest>
-                <attribute name="Main-Class" value="com.rusefi.Version2Header"/>
-            </manifest>
-		<zipfileset dir="build/classes" includes="**/*.class"/>
-        </jar>
-    </target>
-
-</project>
\ No newline at end of file