From c3cab45d16615da28235982677881c955a6b8553 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 19 Jan 2015 12:50:52 -0800
Subject: [PATCH] remove physics lib requirement for gvr-interface

---
 BUILD_ANDROID.md             | 5 +++--
 gvr-interface/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md
index 23670a6686..b4de96e0bd 100644
--- a/BUILD_ANDROID.md
+++ b/BUILD_ANDROID.md
@@ -49,7 +49,7 @@ If you have been building other components it is possible that the OpenSSL compi
 
 Download the [Intel Threading Building Blocks source](https://www.threadingbuildingblocks.org/download) and extract the tarball inside your `ANDROID_LIB_DIR`. Rename the extracted folder to `tbb`.
 
-From the tbb directory, execute the following commands. This will set the compiler and archive tool to the correct ones from the NDK install and then build TBB using `ndk-build`.
+From the tbb directory, execute the following commands. This will set the compiler and archive tool to the correct ones from the NDK install and then build TBB using `ndk-build`. Then, the compiled libs are copied to a lib folder in the root of tbb directory.
 
 ```
 export CC=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-gcc
@@ -57,8 +57,9 @@ export AR=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_
 cd jni
 ndk-build target=android tbb tbbmalloc arch=arm
 cd ../
+mkdir lib
 cp -rf build/linux_arm_*/**/*.so lib/
-``` 
+```
 
 ####GLM
 
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index f2b080eab1..65e798d28a 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -13,7 +13,7 @@ include_glm()
 set(REQUIRED_HIFI_LIBRARIES "shared" "networking")
 
 link_hifi_libraries(${REQUIRED_HIFI_LIBRARIES})
-link_shared_dependencies()
+include_dependency_includes()
 
 set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME})
 set(ANDROID_APP_DISPLAY_NAME Interface)