summaryrefslogtreecommitdiffstats
path: root/core/dumpvar.mk
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2011-11-11 09:02:01 -0800
committerNick Kralevich <nnk@google.com>2011-11-11 09:02:01 -0800
commit0ab21d3ed34edbeb8631002db47a6a309581d9a4 (patch)
tree1c9b0a5b11d09f8b39c89c16856cf4b6e115e4c2 /core/dumpvar.mk
parentba2c734f71202522464db540260b0df696d26c06 (diff)
downloadbuild-0ab21d3ed34edbeb8631002db47a6a309581d9a4.zip
build-0ab21d3ed34edbeb8631002db47a6a309581d9a4.tar.gz
build-0ab21d3ed34edbeb8631002db47a6a309581d9a4.tar.bz2
make gdbclient work on x86
Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
Diffstat (limited to 'core/dumpvar.mk')
-rw-r--r--core/dumpvar.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk
index e0de464..c3fb5b4 100644
--- a/core/dumpvar.mk
+++ b/core/dumpvar.mk
@@ -5,11 +5,17 @@ ifeq ($(CALLED_FROM_SETUP),true)
ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)
-# Add the toolchain bin dir if it actually exists
+# Add the ARM toolchain bin dir if it actually exists
ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),)
# this should be copied to HOST_OUT_EXECUTABLES instead
ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin
endif
+
+# Add the x86 toolchain bin dir if it actually exists
+ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin),)
+ # this should be copied to HOST_OUT_EXECUTABLES instead
+ ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin
+endif
ANDROID_BUILD_PATHS := $(ABP)
ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)