Fixes #317 also add comment about CMake path
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5a99442..433e546 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.4.1)
-# TODO: Remove this line and inherit it from the host environment
+# Usually this file is called from run_tests.sh which requires the $ANDROID_NDK variable to be set so there's no need
+# to set it here. Comments below are left in intentionally in case they're useful in future.
# This may work on Mac OS.
# set(ANDROID_NDK $ENV{HOME}/Library/Android/sdk/ndk-bundle)
# This may work on Linux.
@@ -17,9 +18,6 @@
add_subdirectory(${OBOE_DIR} ./oboe-bin)
include_directories(${OBOE_DIR}/include)
-# include android headers
-include_directories(${ANDROID_NDK}/sysroot/usr/include)
-
# Build the test binary
add_executable(testOboe
testUtilities.cpp
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 63faafa..cdf4816 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -16,7 +16,7 @@
# Script to build and run the Oboe tests on an attached Android device or emulator
#
# Prerequisites:
-# - CMake on PATH. This is usually found in $ANDROID_HOME/cmake/bin.
+# - CMake on PATH. This is usually found in $ANDROID_HOME/cmake/<version>/bin.
# - ANDROID_NDK environment variable is set to your Android NDK location
# e.g. $HOME/Library/Android/sdk/ndk-bundle
# - Android device or emulator attached and accessible via adb
@@ -59,8 +59,9 @@
fi
if [ ! $(type -P ${CMAKE}) ]; then
- echo "${CMAKE} was not found on your path. You can install it using Android Studio using Tools->Android->SDK Manager->SDK Tools."
- exit 1
+ echo "${CMAKE} was not found on your path. You can install it using Android Studio using Tools->Android->SDK Manager->SDK Tools."
+ echo "Once done you will need to add ${HOME}/Library/Android/sdk/cmake/<current_version>/bin to your path."
+ exit 1
fi
# Get the device ABI