From: Armin Novak <anovak@thinstuff.at>
Date: Tue, 12 Nov 2013 09:23:22 +0000 (+0100)
Subject: Split ndk-build and ant runs to different targets, ndk-build is now also
X-Git-Tag: 1.2.0-beta1+android7~147^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f93b69320f95ac826cfc6ac50caf98112aea9911;p=platform%2Fupstream%2Ffreerdp.git

Split ndk-build and ant runs to different targets, ndk-build is now also
run, if no ant build is desired.
---

diff --git a/client/Android/aFreeRDP/CMakeLists.txt b/client/Android/aFreeRDP/CMakeLists.txt
index 664f197..597349a 100644
--- a/client/Android/aFreeRDP/CMakeLists.txt
+++ b/client/Android/aFreeRDP/CMakeLists.txt
@@ -37,6 +37,13 @@ if (ANDROID_SDK)
 		${CMAKE_CURRENT_BINARY_DIR}/local.properties @ONLY)
 endif()
 
+# command to create the android package
+add_custom_target( ndk-build ALL
+	COMMAND ${NDK_COMMAND} NDK_DEBUG=${NDK_DEBUG}
+	WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+	DEPENDS freerdp-android 
+)
+
 if(ANDROID_BUILD_JAVA)
 	if(NOT ANDROID_BUILD_JAVA_DEBUG)
 		set(APK "${CMAKE_CURRENT_BINARY_DIR}/bin/${ANDROID_PACKAGE_NAME}-release-unsigned.apk")
@@ -47,11 +54,10 @@ if(ANDROID_BUILD_JAVA)
   # command to create the android package
 	add_custom_command(
 		OUTPUT "${APK}"
-		COMMAND ${NDK_COMMAND} NDK_DEBUG=${NDK_DEBUG}
 		COMMAND ${ANT_COMMAND} ${ANDROID_BUILD_TYPE}
 		WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 		MAIN_DEPENDENCY AndroidManifest.xml
-		DEPENDS freerdp-android
+		DEPENDS ndk-build
 			${CMAKE_CURRENT_BINARY_DIR}/local.properties
 	)
 	add_custom_target(android-package ALL SOURCES "${APK}")