From 51041bd1bc83b1771f8581cca99105302d718182 Mon Sep 17 00:00:00 2001
From: Armin Novak <anovak@thinstuff.at>
Date: Fri, 8 Nov 2013 12:46:32 +0100
Subject: [PATCH] Modified ant build target.

---
 client/Android/aFreeRDP/CMakeLists.txt | 35 ++++----------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/client/Android/aFreeRDP/CMakeLists.txt b/client/Android/aFreeRDP/CMakeLists.txt
index 5910bac70..99e715791 100644
--- a/client/Android/aFreeRDP/CMakeLists.txt
+++ b/client/Android/aFreeRDP/CMakeLists.txt
@@ -35,48 +35,23 @@ if (ANDROID_SDK)
 		${CMAKE_CURRENT_BINARY_DIR}/local.properties @ONLY)
 endif()
 
-if("${ANDROID_DEBUG_ENABLE}" STREQUAL "true")
-	# 1. generate Android.mk
-	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/jni/Android.mk
-		"APP_ABI := ${ANDROID_NDK_ABI_NAME}\n")
-
-	# 2. generate gdb.setup
-	get_directory_property(INCLUDE_DIRECTORIES DIRECTORY . INCLUDE_DIRECTORIES)
-	string(REGEX REPLACE ";" " " INCLUDE_DIRECTORIES "${INCLUDE_DIRECTORIES}")
-	set(LIB_DIRECTORIES "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}")
-	file(WRITE ${ANDROID_BINARY_DIR}/libs/${ANDROID_NDK_ABI_NAME}/gdb.setup
-		"set solib-search-path ${CMAKE_CURRENT_BINARY_DIR}/obj/local/${ANDROID_NDK_ABI_NAME}\n")
-	file(APPEND ${ANDROID_BINARY_DIR}/libs/${ANDROID_NDK_ABI_NAME}/gdb.setup
-		"directory ${INCLUDE_DIRECTORIES} ${LIB_DIRECTORIES}\n")
-
-	# 3. copy gdbserver executable
-	file(COPY ${ANDROID_NDK}/prebuilt/android-${ANDROID_ARCH_NAME}/gdbserver/gdbserver
-		DESTINATION ${ANDROID_BINARY_DIR}/libs/${ANDROID_NDK_ABI_NAME}/)
-
-	# 4. Convenience target to launch debugger.
-	add_custom_target(debug-ndk
-		COMMAND adb install -r bin/aFreeRDP-debug.apk
-		COMMAND ndk-gdb --start --verbose --force
-		WORKING_DIRECTORY ${CURRENT_BINARY_DIR}
-		)
-endif()
-
 if(ANDROID_BUILD_JAVA)
 	if(NOT ANDROID_BUILD_JAVA_DEBUG)
-		set(APK "${ANDROID_BINARY_DIR}/bin/${ANDROID_PACKAGE_NAME}-release-unsigned.apk")
+		set(APK "${CMAKE_CURRENT_BINARY_DIR}/bin/${ANDROID_PACKAGE_NAME}-release-unsigned.apk")
 	else()
-		set(APK "${ANDROID_BINARY_DIR}/bin/${ANDROID_PACKAGE_NAME}-debug.apk")
+		set(APK "${CMAKE_CURRENT_BINARY_DIR}/bin/${ANDROID_PACKAGE_NAME}-debug.apk")
 	endif()
 
   # command to create the android package
 	add_custom_command(
 		OUTPUT "${APK}"
 		COMMAND ${ANT_COMMAND} ${ANDROID_BUILD_TYPE}
-		WORKING_DIRECTORY "${ANDROID_BINARY_DIR}"
+		WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 		MAIN_DEPENDENCY AndroidManifest.xml
 		DEPENDS freerdp-android
 			${CMAKE_CURRENT_BINARY_DIR}/local.properties
 	)
 	add_custom_target(android-package ALL SOURCES "${APK}")
-	SET_DIRECTORY_PROPERTIES(PROPERTIES  ADDITIONAL_MAKE_CLEAN_FILES "gen;bin;obj;libs")
 endif()
+	
+SET_DIRECTORY_PROPERTIES(PROPERTIES  ADDITIONAL_MAKE_CLEAN_FILES "gen;bin;obj;libs")