Android: Fix build

diff --git a/client/Android/FreeRDPCore/jni/android_freerdp.c b/client/Android/FreeRDPCore/jni/android_freerdp.c
index cf79453..d571e10 100644 (file)
--- a/client/Android/FreeRDPCore/jni/android_freerdp.c
+++ b/client/Android/FreeRDPCore/jni/android_freerdp.c
@@ -796,12 +796,12 @@ JNIEXPORT jboolean JNICALL jni_freerdp_update_graphics(
 JNIEXPORT void JNICALL jni_freerdp_send_key_event(
        JNIEnv *env, jclass cls, jint instance, jint keycode, jboolean down)
 {
-       RDP_SCANCODE scancode;
+       DWORD scancode;
        ANDROID_EVENT* event;
 
        freerdp* inst = (freerdp*)instance;
 
-       scancode = freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(keycode);
+       scancode = GetVirtualScanCodeFromVirtualKeyCode(keycode, 4);
        int flags = (down == JNI_TRUE) ? KBD_FLAGS_DOWN : KBD_FLAGS_RELEASE;
        flags |= (RDP_SCANCODE_EXTENDED(scancode)) ? KBD_FLAGS_EXTENDED : 0;
        event = (ANDROID_EVENT*) android_event_key_new(flags, RDP_SCANCODE_CODE(scancode));

diff --git a/client/Android/aFreeRDP/CMakeLists.txt b/client/Android/aFreeRDP/CMakeLists.txt
index 9dd3b61..d17533b 100644 (file)
--- a/client/Android/aFreeRDP/CMakeLists.txt
+++ b/client/Android/aFreeRDP/CMakeLists.txt
@@ -38,7 +38,7 @@ if(ANDROID_BUILD_JAVA)
                COMMAND ${ANT_COMMAND} ${ANDROID_BUILD_TYPE}
                WORKING_DIRECTORY "${ANDROID_SOURCE_DIR}"
                MAIN_DEPENDENCY AndroidManifest.xml
-               DEPENDS freerdp-android local.properties android-lib
+               DEPENDS freerdp-android local.properties #android-lib
        )
        add_custom_target(android-package ALL SOURCES "${APK}")
        SET_DIRECTORY_PROPERTIES(PROPERTIES  ADDITIONAL_MAKE_CLEAN_FILES "gen;bin")