From e2b188b5e98d8909bca33eab2bbc84b1cfe5741f Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Sun, 3 Apr 2022 19:08:12 +0200
Subject: [PATCH] Android pass build type Gradle > Toolchain > CMake

---
 build.gradle                            | 2 ++
 misc/Android/prepare-toolchain-clang.sh | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/build.gradle b/build.gradle
index c720a8bd8..f762fc45a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -199,6 +199,7 @@ ext.buildLibretroshareNativeLib =
 			environment "ANDROID_PLATFORM_VER", pApiLevel
 			environment "ANDROID_NDK_ARCH", toolchainArch
 			environment "RS_EXTRA_CMAKE_OPTS", getRsExtraCmakeOpts()
+			environment "TOOLCHAIN_BUILD_TYPE", pBuildType
 			commandLine toolChainScriptPath
 		}
 	}
@@ -212,6 +213,7 @@ ext.buildLibretroshareNativeLib =
 			environment "ANDROID_PLATFORM_VER", pApiLevel
 			environment "ANDROID_NDK_ARCH", toolchainArch
 			environment "RS_EXTRA_CMAKE_OPTS", getRsExtraCmakeOpts()
+			environment "TOOLCHAIN_BUILD_TYPE", pBuildType
 			commandLine toolChainScriptPath, 'build_libretroshare'
 		}
 	}
diff --git a/misc/Android/prepare-toolchain-clang.sh b/misc/Android/prepare-toolchain-clang.sh
index 358ed2970..7e5dbf8a5 100755
--- a/misc/Android/prepare-toolchain-clang.sh
+++ b/misc/Android/prepare-toolchain-clang.sh
@@ -106,6 +106,8 @@ define_default_value REPORT_DIR "$(pwd)/$(basename ${NATIVE_LIBS_TOOLCHAIN_PATH}
 define_default_value RS_SRC_DIR "$(realpath $(dirname $BASH_SOURCE)/../../)"
 define_default_value RS_EXTRA_CMAKE_OPTS ""
 
+# Debug or Release we should give support at least at those two builds type supported by CMake
+define_default_value TOOLCHAIN_BUILD_TYPE ""
 
 cArch=""
 eABI=""
@@ -206,8 +208,13 @@ function andro_cmake()
 	esac
 
 	_hi="$HOST_IGNORE_PREFIX"
+	
+	cmakeBuildType=""
+	[ "$TOOLCHAIN_BUILD_TYPE" == "" ] ||
+		cmakeBuildType="-DCMAKE_BUILD_TYPE=$TOOLCHAIN_BUILD_TYPE"
 
 	cmake \
+		$cmakeBuildType \
 		-DCMAKE_SYSTEM_PROCESSOR=$cmakeProc \
 		-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
 		-DCMAKE_PREFIX_PATH="${PREFIX}" \