Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update Android.mk to add support for x86

Hardcoding the Android toolkit to ARM breaks emulator-x86 firefoxos target. This will check the TARGET_ARCH variable and choose the correct toolchain.
  • Loading branch information...
commit 6f2bd55c0752e2ede4297790b43396b2053898b0 1 parent 4eca2f6
@bkero bkero authored jrfonseca committed
Showing with 9 additions and 1 deletion.
  1. +9 −1 Android.mk
View
10 Android.mk
@@ -17,6 +17,14 @@ $(shell echo "CMake present but NDK not found at $(abspath $(NDK)), will not com
else # NDK
$(shell echo "CMake and NDK ($(abspath $(NDK))) found, will compile apitrace" >&2)
+ifeq ($(TARGET_ARCH),arm)
+TOOLCHAIN := arm-linux-androideabi-4.4.x
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+TOOLCHAIN := i686-android-linux-4.4.3
+endif
+
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -56,7 +64,7 @@ apitrace_private_target:
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \
-DANDROID_NDK=../../$(NDK) \
-DANDROID_NDK_LAYOUT=LINARO \
- -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.4.x \
+ -DANDROID_TOOLCHAIN_NAME=$(TOOLCHAIN) \
-DANDROID_API_LEVEL=9 \
-DANDROID_NO_UNDEFINED=OFF \
-DLIBRARY_OUTPUT_PATH_ROOT=../../$(MY_APITRACE_BUILD_ROOT_TARGET) \
Please sign in to comment.
Something went wrong with that request. Please try again.