Upgrade build system to use new PicoVR AAR (#3200)

MozillaReality · Apr 21, 2020 · 9510e65 · 9510e65
1 parent d9a7eec
commit 9510e65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -128,11 +128,6 @@ add_library(wavevr-lib SHARED IMPORTED)
 set_target_properties(wavevr-lib PROPERTIES IMPORTED_LOCATION
                       ${CMAKE_SOURCE_DIR}/../third_party/wavesdk/build/wvr_client/jni/${ANDROID_ABI}/libwvr_api.so )
 
-add_library(picovr-lib SHARED IMPORTED)
-set_target_properties(picovr-lib PROPERTIES IMPORTED_LOCATION
-        ${CMAKE_SOURCE_DIR}/../third_party/picovr/${ANDROID_ABI}/libPvr_NativeSDK.so )
-
-
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.

diff --git a/app/build.gradle b/app/build.gradle
@@ -186,7 +186,7 @@ android {
             externalNativeBuild {
                 cmake {
                     cppFlags " -DPICOVR"
-                    arguments "-DVR_SDK_LIB=picovr-lib", "-DPICOVR=ON"
+                    arguments "-DPICOVR=ON"
                 }
             }
         }
@@ -435,7 +435,7 @@ dependencies {
     testImplementation deps.work.testing
 
     // Pico
-    picovrImplementation fileTree(dir: "${project.rootDir}/third_party/picovr/", include: ['*.jar'])
+    picovrImplementation fileTree(dir: "${project.rootDir}/third_party/picovr/", include: ['*.aar'])
 }
 
 if (findProject(':servo')) {

diff --git a/third_party_hash b/third_party_hash
@@ -1 +1 @@
-78c45d90567d5eb7dcedc09944b96444041a196f
+2b014a8305a1f50fec61ea6650198efc7345199e