X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=Android.mk;h=9e38fcb730a4023a38c8a62f0c9944495cc1ea9f;hb=d903681b752c3062923c8445b35fea009faece9e;hp=7d1581d41abeca442822e50e872c093a656245fd;hpb=cee519f80118853fe20264c1cc9ff827d66a621f;p=apitrace

diff --git a/Android.mk b/Android.mk
index 7d1581d..9e38fcb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,10 +7,15 @@
 # This may work in other than FirefoxOS environments, but has not been tested.
 #
 
+NDK := prebuilt/ndk/android-ndk-r7
+
 ifeq ($(shell which cmake),)
 $(shell echo "CMake not found, will not compile apitrace" >&2)
 else # cmake
-$(shell echo "CMake found, will compile apitrace" >&2)
+ifeq ($(wildcard $(NDK)),)
+$(shell echo "CMake present but NDK not found at $(abspath $(NDK)), will not compile apitrace" >&2)
+else # NDK
+$(shell echo "CMake and NDK ($(abspath $(NDK))) found, will compile apitrace" >&2)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -49,8 +54,9 @@ apitrace_private_target:
 		cd $(MY_APITRACE_ROOT) && \
 		cmake \
 		-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \
-		-DANDROID_NDK=../../prebuilt/ndk/android-ndk-r7 \
+		-DANDROID_NDK=../../$(NDK) \
 		-DANDROID_NDK_LAYOUT=LINARO \
+		-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.4.x \
 		-DANDROID_API_LEVEL=9 \
 		-DANDROID_NO_UNDEFINED=OFF \
 		-DLIBRARY_OUTPUT_PATH_ROOT=../../$(MY_APITRACE_BUILD_ROOT_TARGET) \
@@ -83,4 +89,5 @@ $(linked_module): apitrace_private_target
 	$(hide) mkdir -p $(dir $@)
 	$(hide) cp $(MY_APITRACE_BUILD_ROOT_TARGET)/apitrace$(TARGET_EXECUTABLE_SUFFIX) $@
 
+endif # NDK
 endif # cmake