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. diff --git a/CMakeLists.txt b/CMakeLists.txt index b45223662c..b30880574d 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) @@ -80,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) 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 @@ - + - + android:configChanges="screenSize|orientation|keyboardHidden|keyboard"> --> 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