Ad support for Oculus SDK v1.12

MozillaReality · Feb 7, 2019 · 5ea39c9 · 5ea39c9
1 parent 208ebf2
commit 5ea39c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -86,6 +86,11 @@ target_sources(
     PUBLIC
     src/oculusvr/cpp/DeviceDelegateOculusVR.cpp
     )
+add_custom_command(TARGET native-lib POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+        ${CMAKE_SOURCE_DIR}/../third_party/ovr_mobile/VrApi/Libs/Android/${ANDROID_ABI}/Release/libvrapi.so
+        ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libvrapi.so
+        )
 endif()
 
 if(SNAPDRAGONVR)
@@ -112,7 +117,7 @@ find_library( # Sets the name of the path variable.
 
 add_library(oculusvr-lib SHARED IMPORTED)
 set_target_properties(oculusvr-lib PROPERTIES IMPORTED_LOCATION
-                      ${CMAKE_SOURCE_DIR}/../third_party/ovr_mobile/VrApi/Libs/${ANDROID_ABI}/libvrapi.so)
+                      ${CMAKE_SOURCE_DIR}/../third_party/ovr_mobile/VrApi/Libs/Android/${ANDROID_ABI}/Release/libvrapi.so)
 
 add_library(googlevr-lib SHARED IMPORTED)
 set_target_properties(googlevr-lib PROPERTIES IMPORTED_LOCATION

diff --git a/app/build.gradle b/app/build.gradle
@@ -202,7 +202,6 @@ android {
             java.srcDirs = [
                     'src/oculusvr/java'
             ]
-            jniLibs.srcDirs = ["${project.rootDir}/third_party/ovr_mobile/VrApi/Libs"]
         }
 
         svr {