commit feec98b139d2ca0b0164a5e178e75ce88b8f492f
author Jean-Baptiste Queru <jbq@google.com> Wed May 16 13:18:39 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Wed May 16 13:18:39 2012 -0700
tree 5f3fabe21a06e92d94f179c4bed05de7d937b949
parent f760bcbae298d63a53c710cf8857de6174857e25
parent 62855a83b86c0b40583888f93d8b054c7d8ac99c

resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07

core/dumpvar.mk

diff --git a/core/dumpvar.mk b/core/dumpvar.mk
index 0f7dd8f..4a44f77 100644
--- a/core/dumpvar.mk
+++ b/core/dumpvar.mk
@@ -16,9 +16,9 @@
 endif
 
 # Add the x86 toolchain bin dir if it actually exists
-ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3/bin),)
+ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin),)
 	# this should be copied to HOST_OUT_EXECUTABLES instead
-	ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3/bin
+	ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin
 endif
 ANDROID_BUILD_PATHS := $(ABP)
 ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)