From b56a596c29040635b1e3bf3999eb24795c7478a3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Aug 2016 13:23:19 -0700
Subject: [PATCH] put android build output in target folder

---
 cmake/android/android.toolchain.cmake | 2 +-
 interface/CMakeLists.txt              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmake/android/android.toolchain.cmake b/cmake/android/android.toolchain.cmake
index de6bce562c..f75e2bdc82 100755
--- a/cmake/android/android.toolchain.cmake
+++ b/cmake/android/android.toolchain.cmake
@@ -1515,7 +1515,7 @@ if( ANDROID_EXPLICIT_CRT_LINK )
 endif()
 
 # setup output directories
-set( LIBRARY_OUTPUT_PATH_ROOT "${CMAKE_BINARY_DIR}/apk" CACHE PATH "root for library output, set this to change where android libs are installed to" )
+set( LIBRARY_OUTPUT_PATH_ROOT "${CMAKE_BINARY_DIR}" CACHE PATH "root for library output, set this to change where android libs are installed to" )
 set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" )
 
 if(NOT _CMAKE_IN_TRY_COMPILE)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index cd4cc9f644..9ada1300c9 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -68,8 +68,10 @@ set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")
 
 # setup the android parameters that will help us produce an APK
 if (ANDROID)
-  set(ANDROID_APK_BUILD_DIR "${CMAKE_BINARY_DIR}/apk-build")
-  set(ANDROID_APK_OUTPUT_DIR "${CMAKE_BINARY_DIR}/apk")
+  set(ANDROID_APK_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/apk-build")
+  set(ANDROID_APK_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/apk")
+
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}")
 
   set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME})
   set(ANDROID_APP_DISPLAY_NAME Interface)