From 05402d0160db038e757ecea5d0eab7b1d2ddd0da Mon Sep 17 00:00:00 2001 From: Bjorn Swenson Date: Tue, 29 Jan 2019 18:14:24 -0800 Subject: [PATCH 1/4] Add note about USB Debugging; --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e50ed3..af93770 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Most users do not need to build LovrApp themselves. For running your own Lua fil PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH adb devices - Get your id number for the device. + To get the ID number for the device. If you do not see your device in the list, you may need to enable USB debugging for the device. For the Oculus Go, you can do this by turning on the device, putting it on, and using the controller to accept the "Allow USB Debugging" popup. * Plug the id number from adb into [https://dashboard.oculus.com/tools/osig-generator/] From 1d9f7fd7a7fc178ad627dd69e6f8596c17ad2ceb Mon Sep 17 00:00:00 2001 From: Bjorn Swenson Date: Tue, 29 Jan 2019 18:29:33 -0800 Subject: [PATCH 2/4] Add note about installing NDK; --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af93770..dd10f5a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Most users do not need to build LovrApp themselves. For running your own Lua fil * Install Android Studio -* Open Android Studio, go into Preferences, search in the box for "SDK". use the "Android SDK" pane to download Android API level 21. Now quit Android Studio (in my testing it is broken and will break your project). +* Open Android Studio, go into Preferences, search in the box for "SDK". Use the "Android SDK" pane and the "SDK Platforms" tab to download Android API level 21. Next, install the NDK from the "SDK Tools" tab of the same pane. Now quit Android Studio (in my testing it is broken and will break your project). * Run: From 5d3fa923f592fdd8793898dadd9cfb4d24e8d952 Mon Sep 17 00:00:00 2001 From: Bjorn Swenson Date: Tue, 29 Jan 2019 19:04:52 -0800 Subject: [PATCH 3/4] Make CLI snippets a little easier to copy/paste; --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dd10f5a..26813c8 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Most users do not need to build LovrApp themselves. For running your own Lua fil * Run: - PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH adb devices + PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH adb devices To get the ID number for the device. If you do not see your device in the list, you may need to enable USB debugging for the device. For the Oculus Go, you can do this by turning on the device, putting it on, and using the controller to accept the "Allow USB Debugging" popup. @@ -24,7 +24,7 @@ Most users do not need to build LovrApp themselves. For running your own Lua fil * You need to build the gradle script in `cmakelib`, then run the installDebug target of the gradle script in `LovrApp/Projects/Android`. You can do this with the `gradlew` script in the root, but it will need the Android tools in `PATH` and the sdk install location in `ANDROID_HOME`. You can just run this at the Bash prompt from the repository root to do all of this: - (export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH ANDROID_HOME=~/Library/Android/sdk GRADLE=`pwd`/gradlew; (cd cmakelib && $GRADLE build) && (cd LovrApp/Projects/Android && $GRADLE installDebug)) && say "Done" + (export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH ANDROID_HOME=~/Library/Android/sdk GRADLE=`pwd`/gradlew; (cd cmakelib && $GRADLE build) && (cd LovrApp/Projects/Android && $GRADLE installDebug)) && say "Done" Notes: * You have to have turned on developer mode on your headset before deploying. @@ -35,7 +35,7 @@ Notes: * If all you have done is changed the assets, you can upload those by running only the final `installDebug` gradlew task. For example: - (export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH ANDROID_HOME=~/Library/Android/sdk GRADLE=`pwd`/gradlew; (cd LovrApp/Projects/Android && $GRADLE installDebug)) + (export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH ANDROID_HOME=~/Library/Android/sdk GRADLE=`pwd`/gradlew; (cd LovrApp/Projects/Android && $GRADLE installDebug)) * To see all the things gradlew can do in a particular directory run it with "tasks" as the argument. * The reason for the long PATH/ANDROID_HOME line is to get the java and android tools into scope for that line. You could also just modify the env vars in your bashrc. From 912376b3131184797129caf1655bd46b75e5ee8f Mon Sep 17 00:00:00 2001 From: mcc Date: Wed, 30 Jan 2019 17:29:19 -0500 Subject: [PATCH 4/4] Clean up redundant text in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 26813c8..4fd4a1b 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Most users do not need to build LovrApp themselves. For running your own Lua fil PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH adb devices - To get the ID number for the device. If you do not see your device in the list, you may need to enable USB debugging for the device. For the Oculus Go, you can do this by turning on the device, putting it on, and using the controller to accept the "Allow USB Debugging" popup. + ...to get the ID number for the device. (If you do not see your device in the list, see "notes" below.) * Plug the id number from adb into [https://dashboard.oculus.com/tools/osig-generator/] @@ -28,7 +28,7 @@ Most users do not need to build LovrApp themselves. For running your own Lua fil Notes: * You have to have turned on developer mode on your headset before deploying. -* If it gets stuck complaining about "unauthorized", try putting on the headset and see if there's a permissions popup. +* You also have to enable USB debugging for the device. For the Oculus Go, you can do this by plugging in the device, putting it on, and using the controller to accept the "Allow USB Debugging" popup. * If you get a message about "signatures do not match the previously installed version", run this and try again: PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin":~/Library/Android/sdk/platform-tools:$PATH adb uninstall org.lovr.appsample