From b25a2a1918858356fb064f49be0e91882babbca2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Jan 2015 10:23:07 -0800
Subject: [PATCH 1/4] temporary removal of VRLib requirement

---
 cmake/android/AndroidManifest.xml.in |  6 +++---
 gvr-interface/CMakeLists.txt         | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in
index 36a2fcd238..32c657444b 100755
--- a/cmake/android/AndroidManifest.xml.in
+++ b/cmake/android/AndroidManifest.xml.in
@@ -6,7 +6,7 @@
   <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/AppDisplayName" android:icon="@drawable/icon">
     
     <!-- VR MODE -->
-    <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_dual"/>
+    <!-- <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_dual"/> -->
     
     <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
               android:name="org.qtproject.qt5.android.bindings.QtActivity"
@@ -47,11 +47,11 @@
       <!-- Splash screen -->
     </activity>
     
-    <activity android:name="com.oculusvr.vrlib.PlatformActivity" 
+    <!-- <activity android:name="com.oculusvr.vrlib.PlatformActivity"
               android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
               android:launchMode="singleTask"
               android:screenOrientation="landscape"
-              android:configChanges="screenSize|orientation|keyboardHidden|keyboard">
+              android:configChanges="screenSize|orientation|keyboardHidden|keyboard"> -->
     </activity>
     
   </application>
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index 451851dd94..372ca68308 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -19,12 +19,12 @@ set(ANDROID_API_LEVEL 19)
 set(ANDROID_APK_PACKAGE io.highfidelity.gvrinterface)
 
 # we need VRLib, so add a project.properties to our apk build folder that says that
-find_path(_OCULUS_VRLIB_DIR NAME VRLib.vcxproj HINTS "/ovr_mobile_sdk/VRLib/")
-if (NOT _OCULUS_VRLIB_DIR)
-  message(FATAL_ERROR "Could not find Oculus Mobile SDK VRLib.")
-endif()
+# find_path(_OCULUS_VRLIB_DIR NAME VRLib.vcxproj HINTS "/ovr_mobile_sdk/VRLib/")
+# if (NOT _OCULUS_VRLIB_DIR)
+#   message(FATAL_ERROR "Could not find Oculus Mobile SDK VRLib.")
+# endif()
 
-file(RELATIVE_PATH RELATIVE_VRLIB_PATH ${ANDROID_APK_OUTPUT_DIR} "${_OCULUS_VRLIB_DIR}")
-file(WRITE "${ANDROID_APK_BUILD_DIR}/project.properties" "android.library.reference.1=${RELATIVE_VRLIB_PATH}")
+# file(RELATIVE_PATH RELATIVE_VRLIB_PATH ${ANDROID_APK_OUTPUT_DIR} "${_OCULUS_VRLIB_DIR}")
+# file(WRITE "${ANDROID_APK_BUILD_DIR}/project.properties" "android.library.reference.1=${RELATIVE_VRLIB_PATH}")
 
 qt_create_apk()
\ No newline at end of file

From 0af9a3ca367a2b0d41d28ea6dd68a938100072db Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Jan 2015 10:36:40 -0800
Subject: [PATCH 2/4] remove an extra underscore

---
 BUILD_ANDROID.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md
index c9628db0b4..79066d4dba 100644
--- a/BUILD_ANDROID.md
+++ b/BUILD_ANDROID.md
@@ -46,7 +46,7 @@ Note that your path to `arm-linux-androideabi-ar` will probably not be the same
 ```
 export ANDROID_NDK_ROOT=YOUR_NDK_ROOT
 ./setenv-android.sh
-export AR=$ANDROID_NDK_ROOT_/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ar
+export AR=$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ar
 ```
 
 Then, from the OpenSSL directory, run the following commands.

From 316bbce83c1d4cfea9c038cff04741d20b10e584 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Jan 2015 11:04:04 -0800
Subject: [PATCH 3/4] allow ANDROID_QT_CMAKE_PREFIX_PATH to designate Qt
 location

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b45223662c..037f91c565 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,8 @@ endif ()
 if (ANDROID)  
   if (NOT ANDROID_QT_CMAKE_PREFIX_PATH)
     set(QT_CMAKE_PREFIX_PATH ${ANDROID_LIB_DIR}/Qt/5.3/android_armv7/lib/cmake)
+  else ()
+    set(QT_CMAKE_PREFIX_PATH ${ANDROID_QT_CMAKE_PREFIX_PATH})
   endif ()
   
   set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)

From 64aa203825f660a784f3615aee99e9b6c541237d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Jan 2015 11:05:48 -0800
Subject: [PATCH 4/4] add output of QT_CMAKE_PREFIX_PATH

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 037f91c565..b30880574d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,7 @@ else ()
 endif ()
 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})
+message(STATUS "QT_CMAKE_PREFIX_PATH is ${QT_CMAKE_PREFIX_PATH}")
 
 # set our OS X deployment target to
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)