Correct CMake bugs, use Java_JAVA_EXE_BIN_LENGTH properly when compiling android with Windows as host cross compile OS, produce 43 example APK

Author: AnastaZIuk

cmake/common.cmake

@@ -362,6 +362,7 @@ macro(nbl_android_create_apk _TARGET)
 		WORKING_DIRECTORY ${NBL_GEN_DIRECTORY}/$<CONFIG>
 		COMMAND ${ANDROID_JAVA_BIN}/keytool -genkey -keystore ${KEYSTORE_FILE} -storepass android -alias ${KEY_ENTRY_ALIAS} -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=, S=, C="
 	)
+	
 	set(D8_SCRIPT "${ANDROID_BUILD_TOOLS}/d8.bat")
     if(NOT EXISTS ${D8_SCRIPT})
         set(DEX_COMMAND ${ANDROID_BUILD_TOOLS}/d8 ./obj/eu/devsh/${TARGET_NAME}/Loader.class --output ./bin/)

cmake/toolchains/android/build.cmake

@@ -104,7 +104,7 @@ if(NBL_BUILD_ANDROID)
 	endif()
 
 	string(LENGTH ${Java_JAVA_EXECUTABLE} Java_JAVA_EXECUTABLE_LENGTH)
-	if(MSVC)
+	if(WIN32) 
 		set(Java_JAVA_EXE_BIN_LENGTH 13)
 	else() 
 		set(Java_JAVA_EXE_BIN_LENGTH 9)
@@ -159,11 +159,8 @@ if(NBL_BUILD_ANDROID)
         unset(__buildTools)
     endif()
 	set(ANDROID_BUILD_TOOLS "${ANDROID_SDK_ROOT_PATH}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}")
-	if(MSVC)
-	set(ANDROID_JAVA_BIN "${JAVA_HOME}")
-	else()
+	
 	set(ANDROID_JAVA_BIN "${JAVA_HOME}/bin")
-	endif()
 	set(ANDROID_JAVA_RT_JAR "${JAVA_HOME}/jre/lib/rt.jar")
 
 	set(ANDROID_APK_TARGET_ID "" CACHE STRING "The Target ID to build the APK for like 'android-99', use <android list targets> to choose another one.")