From 834ee0e346b225926192132980312860fe58d6bc Mon Sep 17 00:00:00 2001
From: Frosty-J <60154347+Frosty-J@users.noreply.github.com>
Date: Fri, 15 Apr 2022 20:51:26 +0100
Subject: [PATCH] Remove leftover armeabi stuff

robovm-build was defined twice
---
 .gitignore                                                      | 2 --
 .../res/com/badlogic/gdx/setup/resources/android/build.gradle   | 2 --
 .../gdx-setup/res/com/badlogic/gdx/setup/resources/gitignore    | 1 -
 3 files changed, 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a647141a2f..ddf62414c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ gwt-unitCache/
 war/
 gen/
 gen-external-apklibs/
-armeabi/
 armeabi-v7a/
 arm64-v8a/
 linux32/
@@ -33,7 +32,6 @@ Release/
 x64/
 x86/
 x86_64/
-robovm-build/
 ipch/
 /dist
 
diff --git a/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/android/build.gradle b/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/android/build.gradle
index c5966940c69..f44795878d8 100644
--- a/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/android/build.gradle
+++ b/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/android/build.gradle
@@ -37,7 +37,6 @@ android {
 // so they get packed with the APK.
 task copyAndroidNatives {
     doFirst {
-        file("libs/armeabi/").mkdirs()
         file("libs/armeabi-v7a/").mkdirs()
         file("libs/arm64-v8a/").mkdirs()
         file("libs/x86_64/").mkdirs()
@@ -47,7 +46,6 @@ task copyAndroidNatives {
             def outputDir = null
             if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
             if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
-            if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
             if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
             if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
             if(outputDir != null) {
diff --git a/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/gitignore b/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/gitignore
index a4b5d51c0d9..3d9d087db26 100644
--- a/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/gitignore
+++ b/extensions/gdx-setup/res/com/badlogic/gdx/setup/resources/gitignore
@@ -18,7 +18,6 @@ www-test/
 .gwt-tmp/
 
 ## Android Studio and Intellij and Android in general
-/android/libs/armeabi/
 /android/libs/armeabi-v7a/
 /android/libs/arm64-v8a/
 /android/libs/x86/