From 763994da5a26c90ba4af97137539c53f2da88fc0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 29 Jan 2015 12:44:03 -0800
Subject: [PATCH] handle gverb move to audio-client

---
 .gitignore                                                   | 1 +
 cmake/android/AndroidManifest.xml.in                         | 2 +-
 .../audio-client}/external/gverb/readme.txt                  | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename {interface => libraries/audio-client}/external/gverb/readme.txt (70%)

diff --git a/.gitignore b/.gitignore
index efdadd51a7..2c13e8117f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ interface/interfaceCache/
 
 # ignore audio-client externals 
 libraries/audio-client/external/*/*
+!libraries/audio-client/external/*/readme.txt
 
 gvr-interface/assets/oculussig*
 gvr-interface/libs/*
\ No newline at end of file
diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in
index f6ce914148..c85430b5b1 100755
--- a/cmake/android/AndroidManifest.xml.in
+++ b/cmake/android/AndroidManifest.xml.in
@@ -51,7 +51,7 @@
               android:configChanges="screenSize|orientation|keyboardHidden|keyboard">
     </activity>
     
-    ${HOCKEY_APP_ACTIVITY}
+    ${ANDROID_EXTRA_APPLICATION_XML}
     
   </application>
   <uses-sdk android:minSdkVersion="${ANDROID_API_LEVEL}" android:targetSdkVersion="${ANDROID_API_LEVEL}"/>
diff --git a/interface/external/gverb/readme.txt b/libraries/audio-client/external/gverb/readme.txt
similarity index 70%
rename from interface/external/gverb/readme.txt
rename to libraries/audio-client/external/gverb/readme.txt
index 2f8991b1d4..bb01e48a74 100644
--- a/interface/external/gverb/readme.txt
+++ b/libraries/audio-client/external/gverb/readme.txt
@@ -1,5 +1,4 @@
-
-Instructions for adding the Gverb library to Interface
+Instructions for adding the Gverb library to audio-client
 (This is a required library)
 Clément Brisset, October 22nd, 2014
 
@@ -9,7 +8,7 @@ Clément Brisset, October 22nd, 2014
 
 2. Extract the archive
 
-3. Place the directories “include” and “src” in interface/external/gverb 
+3. Place the directories “include” and “src” in libraries/audio-client/external/gverb 
    (Normally next to this readme)
 
 4. Clear your build directory, run cmake, build and you should be all set.