Skip to content

Commit

Permalink
Remove WaveVR build dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@MikeRatcliffe @HollowMan6
MikeRatcliffe authored and HollowMan6 committed Aug 1, 2023
1 parent 709f373 commit e4ab6fe
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 30 deletions.
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ Download the [VIVE Wave SDK](https://developer.vive.com/resources/knowledgebase/
```bash
mkdir -p third_party/wavesdk
cp /path/to/the/sdk/2.0.32/SDK/libs/wvr_client.aar third_party/wavesdk
cp ./extra/wavesdk/build.gradle ./third_party/wavesdk
```

Make certain to set the build flavor to `wavevrDebug` in Android Studio before building the project.
Expand Down
71 changes: 64 additions & 7 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,27 @@ android {
'src/wavevr/res'
]
jniLibs.srcDirs = ["${project.rootDir}/third_party/wavesdk/build/wvr_client-${versions.wavevr}/jni"]
packagingOptions {
jniLibs.pickFirsts.add("lib/**/libwvr_api.so")
jniLibs.pickFirsts.add("lib/**/liboverlay_api.so")
jniLibs.pickFirsts.add("lib/**/libwvr_internal_using_assimp.so")
jniLibs.pickFirsts.add("lib/**/libdummy.so")
jniLibs.pickFirsts.add("lib/**/libvrcore_component.so")
jniLibs.pickFirsts.add("lib/**/libwvr_monitor.so")
jniLibs.pickFirsts.add("lib/**/libdummy.so")
jniLibs.pickFirsts.add("lib/**/libwvr_runtime.so")
jniLibs.pickFirsts.add("lib/**/libvr_jni.so")
jniLibs.pickFirsts.add("lib/**/libvrcore_component.so")
jniLibs.pickFirsts.add("lib/**/libwvr_runtime.so")
jniLibs.pickFirsts.add("lib/**/libwvr_ctf_internal_common.so")
jniLibs.pickFirsts.add("lib/**/libwvr_internal_using_assimp.so")
jniLibs.pickFirsts.add("lib/**/libvrcore.so")
jniLibs.pickFirsts.add("lib/**/libwvr_ctf_internal_common.so")
jniLibs.pickFirsts.add("lib/**/libvr_jni.so")
jniLibs.pickFirsts.add("lib/**/libvrcore.so")
jniLibs.pickFirsts.add("lib/**/libwvr_monitor.so")
jniLibs.pickFirsts.add("lib/**/libsvrapi.so")
}
}

wavevrStore {
Expand All @@ -441,6 +462,27 @@ android {
]
jniLibs.srcDirs = ["${project.rootDir}/third_party/wavesdk/build/wvr_client-${versions.wavevr}/jni"]
manifest.srcFile "src/wavevr/AndroidManifest.xml"
packagingOptions {
jniLibs.pickFirsts.add("lib/**/libwvr_api.so")
jniLibs.pickFirsts.add("lib/**/liboverlay_api.so")
jniLibs.pickFirsts.add("lib/**/libwvr_internal_using_assimp.so")
jniLibs.pickFirsts.add("lib/**/libdummy.so")
jniLibs.pickFirsts.add("lib/**/libvrcore_component.so")
jniLibs.pickFirsts.add("lib/**/libwvr_monitor.so")
jniLibs.pickFirsts.add("lib/**/libdummy.so")
jniLibs.pickFirsts.add("lib/**/libwvr_runtime.so")
jniLibs.pickFirsts.add("lib/**/libvr_jni.so")
jniLibs.pickFirsts.add("lib/**/libvrcore_component.so")
jniLibs.pickFirsts.add("lib/**/libwvr_runtime.so")
jniLibs.pickFirsts.add("lib/**/libwvr_ctf_internal_common.so")
jniLibs.pickFirsts.add("lib/**/libwvr_internal_using_assimp.so")
jniLibs.pickFirsts.add("lib/**/libvrcore.so")
jniLibs.pickFirsts.add("lib/**/libwvr_ctf_internal_common.so")
jniLibs.pickFirsts.add("lib/**/libvr_jni.so")
jniLibs.pickFirsts.add("lib/**/libvrcore.so")
jniLibs.pickFirsts.add("lib/**/libwvr_monitor.so")
jniLibs.pickFirsts.add("lib/**/libsvrapi.so")
}
}

hvr {
Expand Down Expand Up @@ -642,6 +684,28 @@ dependencies {
// Snapdragon Spaces
spacesImplementation fileTree(dir: "${project.rootDir}/third_party/spaces", include: ['*.aar'])

// HTC Vive
if (!gradle.startParameter.taskNames.isEmpty() &&
gradle.startParameter.taskNames.get(0).toLowerCase().contains("wavevr")) {
configurations.maybeCreate("default")
artifacts.add("default", file('wvr_client.aar'))

def aarFilename = "wvr_client"

// unzip aar
def unzipDir = file("${rootDir}/third_party/wavesdk/build/${aarFilename}-${versions.wavevr}")
def aarFile = file("${rootDir}/third_party/wavesdk/${aarFilename}.aar")
if (aarFile != null) {
copy {
println 'unzip ' + aarFile
from zipTree(aarFile)
into unzipDir
}
wavevrImplementation fileTree(dir: "${rootDir}/third_party/wavesdk/", include: ['*.aar'])
wavevrStoreImplementation fileTree(dir: "${rootDir}/third_party/wavesdk/", include: ['*.aar'])
}
}

// gecko
def branch = "nightly" // "nightly" or "beta"
geckoImplementation deps.gecko_view."${branch}_x86_64"
Expand Down Expand Up @@ -675,13 +739,6 @@ if (findProject(':servo')) {
}
}

if (findProject(':wavesdk')) {
dependencies {
wavevrImplementation fileTree(dir: "${project.rootDir}/third_party/wavesdk/", include: ['*.aar'])
wavevrStoreImplementation fileTree(dir: "${project.rootDir}/third_party/wavesdk/", include: ['*.aar'])
}
}

if (gradle.hasProperty('geckoViewLocalArm') || gradle.hasProperty('geckoViewLocalX86')) {
throw new GradleException("geckoViewLocal{Arm,X86} are deprecated: use geckoViewLocalTopsrcdir and geckoViewLocalTopobjdir")
}
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ allprojects {

task clean(type: Delete) {
delete rootProject.buildDir
delete "${rootDir}/third_party/wavesdk/build"
}
15 changes: 0 additions & 15 deletions extra/wavesdk/build.gradle
View file

This file was deleted.

7 changes: 0 additions & 7 deletions settings.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
include ':app'

def wavebuild = new File('third_party/wavesdk/build.gradle')

if (wavebuild.exists()) {
include ':wavesdk'
project(':wavesdk').projectDir = new File('third_party/wavesdk/')
}

Properties userProperties = null;
if (file('user.properties').canRead()) {
userProperties = new Properties()
Expand Down

0 comments on commit e4ab6fe

Please sign in to comment.