resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp

Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2

diff --cc core/combo/TARGET_linux-arm.mk
index 3a3a5bd,67844c8..c332b41
--- 1/core/combo/TARGET_linux-arm.mk
--- 2/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@@ -44,16 -44,20 +44,20 @@@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE
  # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
  ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
  TARGET_TOOLS_PREFIX := \
 -      prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
 +      prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-
  endif
  
- TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)
- TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX)
- TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)
- TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX)
- TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)
- TARGET_STRIP := $(HOST_OUT_EXECUTABLES)/soslim$(HOST_EXECUTABLE_SUFFIX)
- TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip --shady --quiet $< --outfile $@
+ # Only define these if there's actually a gcc in there.
+ # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
+ ifneq ($(wildcard $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)),)
+     TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)
+     TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX)
+     TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)
+     TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX)
+     TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)
+     TARGET_STRIP := $(HOST_OUT_EXECUTABLES)/soslim$(HOST_EXECUTABLE_SUFFIX)
+     TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip --shady --quiet $< --outfile $@
+ endif
  
  TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
  

diff --cc core/dumpvar.mk
index c94d943,58cdc6d..831ed97
--- 1/core/dumpvar.mk
--- 2/core/dumpvar.mk
+++ b/core/dumpvar.mk
@@@ -8,8 -8,11 +8,11 @@@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES
  ifeq ($(TARGET_SIMULATOR),true)
        ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES)
  else
-       # this should be copied to HOST_OUT_EXECUTABLES instead
-       ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin
+       # Add the toolchain bin dir if it actually exists
 -      ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.3/bin),)
++      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-eabi-4.4.3/bin
++              ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin
+       endif
  endif
  ANDROID_BUILD_PATHS := $(ABP)
  ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

diff --cc envsetup.sh
index 6611553,322e488..a65d39b
--- 1/envsetup.sh
--- 2/envsetup.sh
+++ b/envsetup.sh
@@@ -106,11 -109,16 +109,23 @@@ function setpaths(
      # and in with the new
      CODE_REVIEWS=
      prebuiltdir=$(getprebuilt)
-     export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-linux-androideabi-4.4.x/bin
-     export ARM_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.3/bin
 -    toolchaindir=toolchain/arm-eabi-4.4.3/bin
++
+     # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
++    export ANDROID_EABI_TOOLCHAIN=
++    toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
+     if [ -d "$prebuiltdir/$toolchaindir" ]; then
+         export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
 -    else
 -        export ANDROID_EABI_TOOLCHAIN=
+     fi
++
++    export ARM_EABI_TOOLCHAIN=
++    toolchaindir=toolchain/arm-eabi-4.4.3/bin
++    if [ -d "$prebuiltdir/$toolchaindir" ]; then
++        export ARM_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
++    fi
++
      export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
      export ANDROID_QTOOLS=$T/development/emulator/qtools
 -    export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS
 +    export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ARM_EABI_TOOLCHAIN$CODE_REVIEWS
      export PATH=$PATH$ANDROID_BUILD_PATHS
  
      unset ANDROID_JAVA_TOOLCHAIN