diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in index eea44e1a7b..bc67dd8dfa 100755 --- a/cmake/android/AndroidManifest.xml.in +++ b/cmake/android/AndroidManifest.xml.in @@ -62,12 +62,12 @@ - - - - + + + + \ No newline at end of file diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt index b410290694..f2b080eab1 100644 --- a/gvr-interface/CMakeLists.txt +++ b/gvr-interface/CMakeLists.txt @@ -15,10 +15,19 @@ set(REQUIRED_HIFI_LIBRARIES "shared" "networking") link_hifi_libraries(${REQUIRED_HIFI_LIBRARIES}) link_shared_dependencies() -set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) +set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME}) set(ANDROID_APP_DISPLAY_NAME Interface) set(ANDROID_API_LEVEL 19) set(ANDROID_APK_PACKAGE io.highfidelity.gvrinterface) set(ANDROID_APK_FULLSCREEN true) +# 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() + +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