From 46ffbb13aa80e09fde3c242cc997c7b581fa2e91 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 19 Nov 2014 10:03:42 -0800
Subject: [PATCH] copy the assets folder to the apk build

---
 .gitignore                      | 2 ++
 cmake/android/QtCreateAPK.cmake | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6e6b69cb66..b5c601b8a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ interface/external/*/*
 
 # Ignore interfaceCache for Linux users
 interface/interfaceCache/
+
+gvr-interface/assets/oculussig*
\ No newline at end of file
diff --git a/cmake/android/QtCreateAPK.cmake b/cmake/android/QtCreateAPK.cmake
index a3dea6b65a..dc87606442 100644
--- a/cmake/android/QtCreateAPK.cmake
+++ b/cmake/android/QtCreateAPK.cmake
@@ -46,6 +46,13 @@ macro(qt_create_apk)
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/res" "${ANDROID_APK_BUILD_DIR}/res"
   )
+  
+  # copy the assets folder from the target to the apk build dir
+  add_custom_command(
+    TARGET ${TARGET_NAME}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets" "${ANDROID_APK_BUILD_DIR}/assets"
+  )
 
   # figure out where the qt dir is
   get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)