From ad9b44bfed22f6651c63e2c168ae6027f0307c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20M=C3=BCller?= <robytemueller@gmail.com>
Date: Wed, 8 May 2024 12:49:14 +0200
Subject: [PATCH] Remove `local.properties` and add it to `.gitignore`

This file is not supposed to be added to version control and will be regenerated whenever the Gradle build is run.
---
 .gitignore                             |  3 +++
 scripts/android/cmake_android.sh       |  1 -
 scripts/android/files/build.sh         |  3 ---
 scripts/android/files/local.properties | 10 ----------
 4 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 scripts/android/files/local.properties

diff --git a/.gitignore b/.gitignore
index fc39ec3d7..3c8434084 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,9 @@ testrunner\[1\]_include.cmake
 
 /SDL2.framework
 
+# Android
+local.properties
+
 # Ignore all the generated executables without extensions (for non-Windows
 # systems).
 DDNet
diff --git a/scripts/android/cmake_android.sh b/scripts/android/cmake_android.sh
index 9f0b242e1..7073a57d6 100755
--- a/scripts/android/cmake_android.sh
+++ b/scripts/android/cmake_android.sh
@@ -154,7 +154,6 @@ copy_dummy_files scripts/android/files/gradle-wrapper.jar gradle-wrapper.jar
 copy_dummy_files scripts/android/files/build.gradle build.gradle
 copy_dummy_files scripts/android/files/gradle-wrapper.properties gradle-wrapper.properties
 copy_dummy_files scripts/android/files/gradle.properties gradle.properties
-copy_dummy_files scripts/android/files/local.properties local.properties
 copy_dummy_files scripts/android/files/proguard-rules.pro proguard-rules.pro
 copy_dummy_files scripts/android/files/settings.gradle settings.gradle
 copy_dummy_files scripts/android/files/AndroidManifest.xml src/main/AndroidManifest.xml
diff --git a/scripts/android/files/build.sh b/scripts/android/files/build.sh
index 1086dacf6..d61843695 100644
--- a/scripts/android/files/build.sh
+++ b/scripts/android/files/build.sh
@@ -36,9 +36,6 @@ sed -i "s/DDNet/${2}/g" src/main/res/values/strings.xml
 sed -i "s/\"DDNet\"/\"${2}\"/g" src/main/AndroidManifest.xml
 sed -i "s/tw.DDNet/${_REPLACE_PACKAGE_NAME_STR}/g" src/main/AndroidManifest.xml
 
-__TW_HOME_DIR=$(echo "$HOME"|sed 's/\//\\\//g')
-
-sed -i "s/TW_HOME_DIR/${__TW_HOME_DIR}/g" local.properties
 sed -i "s/TW_NDK_VERSION/${ANDROID_NDK_VERSION}/g" build.gradle
 sed -i "s/TW_VERSION_CODE/${TW_VERSION_CODE}/g" build.gradle
 sed -i "s/TW_VERSION_NAME/${TW_VERSION_NAME}/g" build.gradle
diff --git a/scripts/android/files/local.properties b/scripts/android/files/local.properties
deleted file mode 100644
index 73c3a2107..000000000
--- a/scripts/android/files/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir="TW_HOME_DIR/Android/Sdk"