GLX: More consistent naming of an AttribArray.

[apitrace] / Android.mk

diff --git a/Android.mk b/Android.mk
index a638c9b1803b1c04e525d5b6c5e08189b099b7d3..7e4c7a7880420613b046628617f6bad9a1341962 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -7,6 +7,11 @@
 # This may work in other than FirefoxOS environments, but has not been tested.
 #
 
+ifeq ($(shell which cmake),)
+$(shell echo "CMake not found, will not compile apitrace" >&2)
+else # cmake
+$(shell echo "CMake found, will compile apitrace" >&2)
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -44,8 +49,9 @@ apitrace_private_target:
                cd $(MY_APITRACE_ROOT) && \
                cmake \
                -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \
-               -DANDROID_NDK=../../prebuilt/ndk/android-ndk-r8 \
+               -DANDROID_NDK=../../prebuilt/ndk/android-ndk-r7 \
                -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) \
@@ -77,3 +83,5 @@ $(linked_module): apitrace_private_target
        $(hide) # apitrace: copy apitrace executable to where the build system expects it
        $(hide) mkdir -p $(dir $@)
        $(hide) cp $(MY_APITRACE_BUILD_ROOT_TARGET)/apitrace$(TARGET_EXECUTABLE_SUFFIX) $@
+
+endif # cmake