From e3a4d40b619ef5606bbde6989b14570af95c227f Mon Sep 17 00:00:00 2001
From: Martin Fleisz <mfleisz@thinstuff.at>
Date: Wed, 13 Mar 2013 06:02:37 -0700
Subject: [PATCH] Android: Fixed JNI regenerate script

---
 CMakeLists.txt                          | 1 +
 scripts/regenerate_jni_headers.sh       | 6 ------
 scripts/regenerate_jni_headers.sh.cmake | 6 ++++++
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100755 scripts/regenerate_jni_headers.sh
 create mode 100755 scripts/regenerate_jni_headers.sh.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5bbdfdd3..63f5d1c46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,6 +210,7 @@ if(ANDROID)
 	endif()
 	set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${FREERDP_ANDROID_EXTERNAL_SSL_PATH})
 	set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/client/Android/FreeRDPCore/libs/${ANDROID_ABI})
+	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/scripts/regenerate_jni_headers.sh.cmake ${CMAKE_CURRENT_SOURCE_DIR}/scripts/regenerate_jni_headers.sh @ONLY)
 endif()
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
diff --git a/scripts/regenerate_jni_headers.sh b/scripts/regenerate_jni_headers.sh
deleted file mode 100755
index de61149e2..000000000
--- a/scripts/regenerate_jni_headers.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cd client/Android/jni/generated/
-javah -classpath ../../bin/classes/ -jni com.freerdp.afreerdp.services.LibFreeRDP 
-rm com_freerdp_afreerdp_services_LibFreeRDP_EventListener.h \
-   com_freerdp_afreerdp_services_LibFreeRDP_UIEventListener.h
diff --git a/scripts/regenerate_jni_headers.sh.cmake b/scripts/regenerate_jni_headers.sh.cmake
new file mode 100755
index 000000000..6bd709a32
--- /dev/null
+++ b/scripts/regenerate_jni_headers.sh.cmake
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd client/Android/FreeRDPCore/jni/generated/
+javah -classpath ../../bin/classes:@ANDROID_SDK@/platforms/android-8/android.jar -jni com.freerdp.freerdpcore.services.LibFreeRDP 
+rm com_freerdp_freerdpcore_services_LibFreeRDP_EventListener.h \
+   com_freerdp_freerdpcore_services_LibFreeRDP_UIEventListener.h