Merge "Remove obsolete clang3.1"

11 files changed, 3 insertions, 652 deletions

diff --git a/build/tools/dev-defaults.sh b/build/tools/dev-defaults.sh
index 39754b350..1a25080fb 100644
--- a/build/tools/dev-defaults.sh
+++ b/build/tools/dev-defaults.sh
@@ -77,7 +77,7 @@ DEFAULT_ARCH_TOOLCHAIN_NAME_mips=mipsel-linux-android
 DEFAULT_ARCH_TOOLCHAIN_PREFIX_mips=mipsel-linux-android
 
 # The space-separated list of all LLVM versions we support in NDK
-DEFAULT_LLVM_VERSION_LIST="3.3 3.2 3.1"
+DEFAULT_LLVM_VERSION_LIST="3.3 3.2"
 
 # The default LLVM version (first item in the list)
 DEFAULT_LLVM_VERSION=$(echo "$DEFAULT_LLVM_VERSION_LIST" | tr ' ' '\n' | head -n 1)
diff --git a/docs/text/STANDALONE-TOOLCHAIN.text b/docs/text/STANDALONE-TOOLCHAIN.text
index d2cc58ea0..97d80187a 100644
--- a/docs/text/STANDALONE-TOOLCHAIN.text
+++ b/docs/text/STANDALONE-TOOLCHAIN.text
@@ -136,7 +136,7 @@ installation by using the --llvm-version=<version> option, where
         build/tools/make-standalone-toolchain.sh \
             --install-dir=/tmp/mydir \
             --toolchain=arm-linux-androideabi-4.7 \
-            --llvm-version=3.1
+            --llvm-version=3.3
 
 Note that Clang binaries are copied in addition to the GCC ones, because
 they rely on the same assembler, linker, headers, libraries and C++
@@ -152,7 +152,7 @@ The rest of this section gives more detail about how these work, in case
 you encounter some unexpected problems.
 
 For example, in an ARM standalone installation built with
-`--llvm-version=3.1`, `clang` is a one-liner that looks like this on Unix:
+`--llvm-version=3.3`, `clang` is a one-liner that looks like this on Unix:
 
         `dirname $0`/clang31 -target armv5te-none-linux-androideabi "$@"
 
diff --git a/toolchains/arm-linux-androideabi-clang3.1/config.mk b/toolchains/arm-linux-androideabi-clang3.1/config.mk
deleted file mode 100644
index cf22af7a6..000000000
--- a/toolchains/arm-linux-androideabi-clang3.1/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# config file for the arm llvm-3.1 toolchain for the Android NDK
-# the real meat is in the setup.mk file adjacent to this one
-#
-TOOLCHAIN_ARCH := arm
-TOOLCHAIN_ABIS := armeabi armeabi-v7a
diff --git a/toolchains/arm-linux-androideabi-clang3.1/setup.mk b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
deleted file mode 100644
index c99205dce..000000000
--- a/toolchains/arm-linux-androideabi-clang3.1/setup.mk
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is used to prepare the NDK to build with the arm clang-3.1
-# toolchain any number of source files
-#
-# its purpose is to define (or re-define) templates used to build
-# various sources into target object files, libraries or executables.
-#
-# Note that this file may end up being parsed several times in future
-# revisions of the NDK.
-#
-
-#
-# Override the toolchain prefix
-#
-
-LLVM_VERSION := 3.1
-LLVM_NAME := llvm-$(LLVM_VERSION)
-LLVM_TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(LLVM_NAME)
-LLVM_TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(LLVM_TOOLCHAIN_ROOT))
-LLVM_TOOLCHAIN_PREFIX := $(LLVM_TOOLCHAIN_PREBUILT_ROOT)/bin/
-
-TOOLCHAIN_VERSION := 4.8
-TOOLCHAIN_NAME := arm-linux-androideabi-$(TOOLCHAIN_VERSION)
-TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(TOOLCHAIN_NAME)
-TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(TOOLCHAIN_ROOT))
-TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/arm-linux-androideabi-
-
-TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
-TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
-
-#
-# CFLAGS and LDFLAGS
-#
-
-TARGET_CFLAGS := \
-    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-    -fpic \
-    -ffunction-sections \
-    -funwind-tables \
-    -fstack-protector \
-    -no-canonical-prefixes
-
-TARGET_LDFLAGS += \
-    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-    -no-canonical-prefixes
-
-TARGET_C_INCLUDES := \
-    $(SYSROOT_INC)/usr/include
-
-ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
-    LLVM_TRIPLE := armv7-none-linux-androideabi
-
-    TARGET_CFLAGS += -target $(LLVM_TRIPLE) \
-                     -march=armv7-a \
-                     -mfloat-abi=softfp \
-                     -mfpu=vfpv3-d16
-
-    TARGET_LDFLAGS += -target $(LLVM_TRIPLE) \
-                      -Wl,--fix-cortex-a8
-else
-    LLVM_TRIPLE := armv5te-none-linux-androideabi
-
-    TARGET_CFLAGS += -target $(LLVM_TRIPLE) \
-                     -march=armv5te \
-                     -mtune=xscale \
-                     -msoft-float
-
-    TARGET_LDFLAGS += -target $(LLVM_TRIPLE)
-endif
-
-TARGET_CFLAGS.neon := -mfpu=neon
-
-TARGET_arm_release_CFLAGS :=  -O2 \
-                              -g \
-                              -DNDEBUG \
-                              -fomit-frame-pointer \
-                              -fstrict-aliasing
-
-TARGET_thumb_release_CFLAGS := -mthumb \
-                               -Os \
-                               -g \
-                               -DNDEBUG \
-                               -fomit-frame-pointer \
-                               -fno-strict-aliasing
-
-# When building for debug, compile everything as arm.
-TARGET_arm_debug_CFLAGS := $(TARGET_arm_release_CFLAGS) \
-                           -O0 \
-                           -UNDEBUG \
-                           -fno-omit-frame-pointer \
-                           -fno-strict-aliasing
-
-TARGET_thumb_debug_CFLAGS := $(TARGET_thumb_release_CFLAGS) \
-                             -O0 \
-                             -UNDEBUG \
-                             -marm \
-                             -fno-omit-frame-pointer
-
-# This function will be called to determine the target CFLAGS used to build
-# a C or Assembler source file, based on its tags.
-#
-TARGET-process-src-files-tags = \
-$(eval __arm_sources := $(call get-src-files-with-tag,arm)) \
-$(eval __thumb_sources := $(call get-src-files-without-tag,arm)) \
-$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \
-$(eval __release_sources := $(call get-src-files-without-tag,debug)) \
-$(call set-src-files-target-cflags, \
-    $(call set_intersection,$(__arm_sources),$(__debug_sources)), \
-    $(TARGET_arm_debug_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__arm_sources),$(__release_sources)),\
-    $(TARGET_arm_release_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__arm_sources),$(__debug_sources)),\
-    $(TARGET_arm_debug_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__thumb_sources),$(__release_sources)),\
-    $(TARGET_thumb_release_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__thumb_sources),$(__debug_sources)),\
-    $(TARGET_thumb_debug_CFLAGS)) \
-$(call add-src-files-target-cflags,\
-    $(call get-src-files-with-tag,neon),\
-    $(TARGET_CFLAGS.neon)) \
-$(call set-src-files-text,$(__arm_sources),arm$(space)$(space)) \
-$(call set-src-files-text,$(__thumb_sources),thumb)
diff --git a/toolchains/llvm-3.1/config.mk b/toolchains/llvm-3.1/config.mk
deleted file mode 100644
index fedc9775b..000000000
--- a/toolchains/llvm-3.1/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# config file for the clang-3.1 toolchain for the Android NDK
-# the real meat is in the setup.mk file adjacent to this one
-#
-TOOLCHAIN_ARCH :=
-TOOLCHAIN_ABIS :=
diff --git a/toolchains/llvm-3.1/setup-common.mk b/toolchains/llvm-3.1/setup-common.mk
deleted file mode 100644
index 0d6f72916..000000000
--- a/toolchains/llvm-3.1/setup-common.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-TOOLCHAIN_NAME   := clang-3.1
-TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/
-LLVM_TRIPLE := le32-none-ndk
-
-# For sources/cxx-stl/gnu-libstdc++/$(TOOLCHAIN_VERSION)/libs/*/libsupc++.a
-TOOLCHAIN_VERSION := 4.7
-
-TARGET_CC := $(TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
-TARGET_CXX := $(TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
-TARGET_LD := $(TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
-TARGET_AR := $(TOOLCHAIN_PREFIX)llvm-ar$(HOST_EXEEXT)
-TARGET_STRIP := $(TOOLCHAIN_PREFIX)$(LLVM_TRIPLE)-strip$(HOST_EXEEXT)
-
-# Compiler runtime is determined in bc2native
-TARGET_LIBGCC :=
-
-BC2NATIVE := $(HOST_PYTHON) $(TOOLCHAIN_PREBUILT_ROOT)/bin/ndk-bc2native.py
-
-TARGET_CFLAGS := \
-    -target $(LLVM_TRIPLE) \
-    -emit-llvm \
-    -ffunction-sections \
-    -funwind-tables \
-    -fPIC \
-    -no-canonical-prefixes
-# -nostdlibinc
-
-#TARGET_CXXFLAGS := $(TARGET_CFLAGS) -fno-exceptions -fno-rtti
-
-# reset backend flags
-TARGET_NO_EXECUTE_CFLAGS :=
-
-# Add and LDFLAGS for the target here
-TARGET_LDFLAGS := \
-    -target $(LLVM_TRIPLE) \
-    -emit-llvm \
-    -no-canonical-prefixes
-
-TARGET_C_INCLUDES := \
-    $(SYSROOT_INC)/usr/include
-
-TARGET_release_CFLAGS := -O2 \
-                         -g \
-                         -DNDEBUG \
-                         -fomit-frame-pointer \
-                         -fstrict-aliasing
-
-TARGET_debug_CFLAGS := $(TARGET_release_CFLAGS) \
-                       -O0 \
-                       -UNDEBUG \
-                       -fno-omit-frame-pointer \
-                       -fno-strict-aliasing
-
-# This function will be called to determine the target CFLAGS used to build
-# a C or Assembler source file, based on its tags.
-#
-TARGET-process-src-files-tags = \
-$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \
-$(eval __release_sources := $(call get-src-files-without-tag,debug)) \
-$(call set-src-files-target-cflags, $(__debug_sources), $(TARGET_debug_CFLAGS)) \
-$(call set-src-files-target-cflags, $(__release_sources),$(TARGET_release_CFLAGS)) \
-$(call set-src-files-text,$(LOCAL_SRC_FILES),bc$(space)$(space)) \
-
-ifeq ($(strip $(filter-out $(NDK_KNOWN_ABIS),$(TARGET_ARCH_ABI))),)
-
-define cmd-build-shared-library
-$(PRIVATE_CXX) \
-    -Wl,-soname,$(notdir $(LOCAL_BUILT_MODULE)) \
-    -shared \
-    --sysroot=$(call host-path,$(PRIVATE_SYSROOT_LINK)) \
-    $(PRIVATE_LINKER_OBJECTS_AND_LIBRARIES) \
-    $(PRIVATE_LDFLAGS) \
-    $(PRIVATE_LDLIBS) \
-    -o $(call host-path,$(LOCAL_BUILT_MODULE)) && \
-    $(BC2NATIVE) \
-    --ndk-dir=$(NDK_ROOT) \
-    --abi=$(TARGET_ARCH_ABI) \
-    --platform=$(TARGET_PLATFORM) \
-    --file $(call host-path, $(LOCAL_BUILT_MODULE)) $(patsubst %.bc,%.so,$(call host-path,$(LOCAL_BUILT_MODULE)))
-endef
-
-define cmd-build-executable
-$(PRIVATE_CXX) \
-    -Wl,--gc-sections \
-    -Wl,-z,nocopyreloc \
-    --sysroot=$(call host-path,$(PRIVATE_SYSROOT_LINK)) \
-    $(PRIVATE_LINKER_OBJECTS_AND_LIBRARIES) \
-    $(PRIVATE_LDFLAGS) \
-    $(PRIVATE_LDLIBS) \
-    -o $(call host-path,$(LOCAL_BUILT_MODULE)) && \
-    $(BC2NATIVE) \
-    --ndk-dir=$(NDK_ROOT) \
-    --abi=$(TARGET_ARCH_ABI) \
-    --platform=$(TARGET_PLATFORM) \
-    --file $(call host-path,$(LOCAL_BUILT_MODULE)) $(call host-path,$(LOCAL_BUILT_MODULE))
-endef
-
-endif
diff --git a/toolchains/llvm-3.1/setup.mk b/toolchains/llvm-3.1/setup.mk
deleted file mode 100644
index 8d7aa50e8..000000000
--- a/toolchains/llvm-3.1/setup.mk
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is used to prepare the NDK to build with the clang-3.1
-# toolchain any number of source files
-#
-# its purpose is to define (or re-define) templates used to build
-# various sources into target object files, libraries or executables.
-#
-# Note that this file may end up being parsed several times in future
-# revisions of the NDK.
-#
-
-TOOLCHAIN_VERSION := 4.7
-
-ifneq ($(filter %bcarmeabi-v7a,$(TARGET_ARCH_ABI)),)
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
-TARGET_ARCH_ABI  := armeabi-v7a
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-
-TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/arm-linux-androideabi-$(TOOLCHAIN_VERSION))
-cmd-strip = $(TARGET_PREBUILT_ROOT)/bin/arm-linux-androideabi-strip$(HOST_EXEEXT) --strip-unneeded $(call host-path,$1)
-
-include $(NDK_ROOT)/toolchains/llvm-3.1/setup-common.mk
-
-else
-ifneq ($(filter %bcarmeabi,$(TARGET_ARCH_ABI)),)
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
-TARGET_ARCH_ABI  := armeabi
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-
-TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/arm-linux-androideabi-$(TOOLCHAIN_VERSION))
-cmd-strip = $(TARGET_PREBUILT_ROOT)/bin/arm-linux-androideabi-strip$(HOST_EXEEXT) --strip-unneeded $(call host-path,$1)
-
-include $(NDK_ROOT)/toolchains/llvm-3.1/setup-common.mk
-
-else
-ifneq ($(filter %bcx86,$(TARGET_ARCH_ABI)),)
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-x86
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-x86/gdbserver/gdbserver
-TARGET_ARCH_ABI  := x86
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-
-TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/x86-$(TOOLCHAIN_VERSION))
-cmd-strip = $(TARGET_PREBUILT_ROOT)/bin/i686-linux-android-strip$(HOST_EXEEXT) --strip-unneeded $(call host-path,$1)
-
-include $(NDK_ROOT)/toolchains/llvm-3.1/setup-common.mk
-
-else
-ifneq ($(filter %bcmips,$(TARGET_ARCH_ABI)),)
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-mips
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-mips/gdbserver/gdbserver
-TARGET_ARCH_ABI  := mips
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-
-TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/mipsel-linux-android-$(TOOLCHAIN_VERSION))
-cmd-strip = $(TARGET_PREBUILT_ROOT)/bin/mipsel-linux-android-strip$(HOST_EXEEXT) --strip-unneeded $(call host-path,$1)
-
-include $(NDK_ROOT)/toolchains/llvm-3.1/setup-common.mk
-
-else
-
-ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
-
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
-TARGET_ARCH_ABI  := armeabi-v7a
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/armeabi-v7a/libportable.a $(TARGET_LDLIBS)
-TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/armeabi-v7a/libportable.wrap
-include $(NDK_ROOT)/toolchains/arm-linux-androideabi-clang3.1/setup.mk
-
-else
-ifneq ($(filter %armeabi,$(TARGET_ARCH_ABI)),)
-
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
-TARGET_ARCH_ABI  := armeabi
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/armeabi/libportable.a $(TARGET_LDLIBS)
-TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/armeabi/libportable.wrap
-include $(NDK_ROOT)/toolchains/arm-linux-androideabi-clang3.1/setup.mk
-
-else
-ifneq ($(filter %x86,$(TARGET_ARCH_ABI)),)
-
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-x86
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-x86/gdbserver/gdbserver
-TARGET_ARCH_ABI  := x86
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/x86/libportable.a $(TARGET_LDLIBS)
-TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/x86/libportable.wrap
-include $(NDK_ROOT)/toolchains/x86-clang3.1/setup.mk
-
-else
-ifneq ($(filter %mips,$(TARGET_ARCH_ABI)),)
-
-SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-mips
-TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-mips/gdbserver/gdbserver
-TARGET_ARCH_ABI  := mips
-NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/mips/libportable.a $(TARGET_LDLIBS)
-TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/mips/libportable.wrap
-include $(NDK_ROOT)/toolchains/mipsel-linux-android-clang3.1/setup.mk
-
-else
-
-TARGET_OBJ_EXTENSION := .bc
-TARGET_LIB_EXTENSION := .a
-TARGET_SONAME_EXTENSION := .bc
-
-include $(NDK_ROOT)/toolchains/llvm-3.1/setup-common.mk
-
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
diff --git a/toolchains/mipsel-linux-android-clang3.1/config.mk b/toolchains/mipsel-linux-android-clang3.1/config.mk
deleted file mode 100644
index 35f952420..000000000
--- a/toolchains/mipsel-linux-android-clang3.1/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# config file for the mipsel llvm-3.1 toolchain for the Android NDK
-# the real meat is in the setup.mk file adjacent to this one
-#
-TOOLCHAIN_ARCH := mips
-TOOLCHAIN_ABIS := mips
diff --git a/toolchains/mipsel-linux-android-clang3.1/setup.mk b/toolchains/mipsel-linux-android-clang3.1/setup.mk
deleted file mode 100644
index b1361b27b..000000000
--- a/toolchains/mipsel-linux-android-clang3.1/setup.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is used to prepare the NDK to build with the mipsel llvm-3.1
-# toolchain any number of source files
-#
-# its purpose is to define (or re-define) templates used to build
-# various sources into target object files, libraries or executables.
-#
-# Note that this file may end up being parsed several times in future
-# revisions of the NDK.
-#
-
-#
-# Override the toolchain prefix
-#
-
-LLVM_VERSION := 3.1
-LLVM_NAME := llvm-$(LLVM_VERSION)
-LLVM_TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(LLVM_NAME)
-LLVM_TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(LLVM_TOOLCHAIN_ROOT))
-LLVM_TOOLCHAIN_PREFIX := $(LLVM_TOOLCHAIN_PREBUILT_ROOT)/bin/
-
-TOOLCHAIN_VERSION := 4.8
-TOOLCHAIN_NAME := mipsel-linux-android-$(TOOLCHAIN_VERSION)
-TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(TOOLCHAIN_NAME)
-TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(TOOLCHAIN_ROOT))
-TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/mipsel-linux-android-
-
-TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
-TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
-
-#
-# CFLAGS, C_INCLUDES, and LDFLAGS
-#
-
-LLVM_TRIPLE := mipsel-none-linux-android
-
-TARGET_CFLAGS := \
-        -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-        -target $(LLVM_TRIPLE) \
-        -fpic \
-        -fno-strict-aliasing \
-        -finline-functions \
-        -ffunction-sections \
-        -funwind-tables \
-        -fmessage-length=0 \
-        -no-canonical-prefixes
-
-TARGET_LDFLAGS += \
-        -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-        -target $(LLVM_TRIPLE) \
-        -no-canonical-prefixes
-
-TARGET_C_INCLUDES := \
-    $(SYSROOT_INC)/usr/include
-
-TARGET_mips_release_CFLAGS := -O2 \
-                              -g \
-                              -DNDEBUG \
-                              -fomit-frame-pointer
-
-TARGET_mips_debug_CFLAGS := -O0 \
-                            -g \
-                            -fno-omit-frame-pointer
-
-
-# This function will be called to determine the target CFLAGS used to build
-# a C or Assembler source file, based on its tags.
-TARGET-process-src-files-tags = \
-$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \
-$(eval __release_sources := $(call get-src-files-without-tag,debug)) \
-$(call set-src-files-target-cflags, \
-    $(__debug_sources),\
-    $(TARGET_mips_debug_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(__release_sources),\
-    $(TARGET_mips_release_CFLAGS)) \
-$(call set-src-files-text,$(__debug_sources),mips$(space)) \
-$(call set-src-files-text,$(__release_sources),mips$(space)) \
diff --git a/toolchains/x86-clang3.1/config.mk b/toolchains/x86-clang3.1/config.mk
deleted file mode 100644
index abd42681b..000000000
--- a/toolchains/x86-clang3.1/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# config file for the x86 clang-3.1 toolchain for the Android NDK
-# the real meat is in the setup.mk file adjacent to this one
-#
-TOOLCHAIN_ARCH := x86
-TOOLCHAIN_ABIS := x86
diff --git a/toolchains/x86-clang3.1/setup.mk b/toolchains/x86-clang3.1/setup.mk
deleted file mode 100644
index aa0723bb9..000000000
--- a/toolchains/x86-clang3.1/setup.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is used to prepare the NDK to build with the x86 llvm-3.1
-# toolchain any number of source files
-#
-# its purpose is to define (or re-define) templates used to build
-# various sources into target object files, libraries or executables.
-#
-# Note that this file may end up being parsed several times in future
-# revisions of the NDK.
-#
-
-#
-# Override the toolchain prefix
-#
-
-LLVM_VERSION := 3.1
-LLVM_NAME := llvm-$(LLVM_VERSION)
-LLVM_TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(LLVM_NAME)
-LLVM_TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(LLVM_TOOLCHAIN_ROOT))
-LLVM_TOOLCHAIN_PREFIX := $(LLVM_TOOLCHAIN_PREBUILT_ROOT)/bin/
-
-TOOLCHAIN_VERSION := 4.8
-TOOLCHAIN_NAME := x86-$(TOOLCHAIN_VERSION)
-TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(TOOLCHAIN_NAME)
-TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(TOOLCHAIN_ROOT))
-TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/i686-linux-android-
-
-TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
-TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
-
-LLVM_TRIPLE := i686-none-linux-android
-
-TARGET_CFLAGS := \
-    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-    -target $(LLVM_TRIPLE) \
-    -ffunction-sections \
-    -funwind-tables \
-    -fstack-protector \
-    -fPIC \
-    -no-canonical-prefixes
-
-TARGET_C_INCLUDES := \
-    $(SYSROOT_INC)/usr/include
-
-# Add and LDFLAGS for the target here
-TARGET_LDFLAGS += \
-    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-    -target $(LLVM_TRIPLE) \
-    -no-canonical-prefixes
-
-TARGET_x86_release_CFLAGS := -O2 \
-                             -g \
-                             -DNDEBUG \
-                             -fomit-frame-pointer \
-                             -fstrict-aliasing
-
-# When building for debug, compile everything as x86.
-TARGET_x86_debug_CFLAGS := $(TARGET_x86_release_CFLAGS) \
-                           -O0 \
-                           -UNDEBUG \
-                           -fno-omit-frame-pointer \
-                           -fno-strict-aliasing
-
-# This function will be called to determine the target CFLAGS used to build
-# a C or Assembler source file, based on its tags.
-#
-TARGET-process-src-files-tags = \
-$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \
-$(eval __release_sources := $(call get-src-files-without-tag,debug)) \
-$(call set-src-files-target-cflags, $(__debug_sources), $(TARGET_x86_debug_CFLAGS)) \
-$(call set-src-files-target-cflags, $(__release_sources),$(TARGET_x86_release_CFLAGS)) \
-$(call set-src-files-text,$(LOCAL_SRC_FILES),x86$(space)$(space)) \
-
-# The ABI-specific sub-directory that the SDK tools recognize for
-# this toolchain's generated binaries
-TARGET_ABI_SUBDIR := x86