Fix android.gypi to provide correct include and library paths when using standalone Android toolcha…

Makefile.android

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 41 matching lines @@
 else
   ifeq ($(ARCH), android_ia32)
     DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86
     TOOLCHAIN_ARCH = x86-4.4.3
   else
     $(error Target architecture "${ARCH}" is not supported)
   endif
 endif
 
 TOOLCHAIN_PATH = ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}/prebuilt
-ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR}/bin
+ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR}
 ifeq ($(wildcard $(ANDROID_TOOLCHAIN)),)
   $(error Cannot find Android toolchain in "${ANDROID_TOOLCHAIN}")
 endif
 
 # For mksnapshot host generation.
 DEFINES += host_os=${HOST_OS}
 
 .SECONDEXPANSION:
 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$(basename $$@)
         @$(MAKE) -C "$(OUTDIR)" -f Makefile.$(basename $@) \
-                    CXX="$(ANDROID_TOOLCHAIN)/*-g++" \
-                    AR="$(ANDROID_TOOLCHAIN)/*-ar" \
-                    RANLIB="$(ANDROID_TOOLCHAIN)/*-ranlib" \
-                    CC="$(ANDROID_TOOLCHAIN)/*-gcc" \
-                    LD="$(ANDROID_TOOLCHAIN)/*-ld" \
-                    LINK="$(ANDROID_TOOLCHAIN)/*-g++" \
+                    CXX="$(ANDROID_TOOLCHAIN)/bin/*-g++" \
+                    AR="$(ANDROID_TOOLCHAIN)/bin/*-ar" \
+                    RANLIB="$(ANDROID_TOOLCHAIN)/bin/*-ranlib" \
+                    CC="$(ANDROID_TOOLCHAIN)/bin/*-gcc" \
+                    LD="$(ANDROID_TOOLCHAIN)/bin/*-ld" \
+                    LINK="$(ANDROID_TOOLCHAIN)/bin/*-g++" \
                     BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
                                 python -c "print raw_input().capitalize()") \
                     builddir="$(shell pwd)/$(OUTDIR)/$@"
 
 # Android GYP file generation targets.
 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_ARCHES))
 $(ANDROID_MAKEFILES):
         @GYP_GENERATORS=make-android \
         GYP_DEFINES="${DEFINES}" \
-        CC="${ANDROID_TOOLCHAIN}/*-gcc" \
-        CXX="${ANDROID_TOOLCHAIN}/*-g++" \
+        CC="${ANDROID_TOOLCHAIN}/bin/*-gcc" \
+        CXX="${ANDROID_TOOLCHAIN}/bin/*-g++" \
         build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
                       -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
                       -S.${ARCH} ${GYPFLAGS}