Remove the redundant binutils and gcclibs.
Since we're not ready for the modular layout yet, we don't need to
ship these components separately as they are already in the GCC
package. Remove them to save some space.
Change-Id: Idaa0f53dcbb98f99af8340365598cee409c42c9b
diff --git a/build/core/toolchains/aarch64-linux-android-clang3.6/setup.mk b/build/core/toolchains/aarch64-linux-android-clang3.6/setup.mk
index 42d0d1d..c7d534f 100644
--- a/build/core/toolchains/aarch64-linux-android-clang3.6/setup.mk
+++ b/build/core/toolchains/aarch64-linux-android-clang3.6/setup.mk
@@ -32,7 +32,8 @@
TOOLCHAIN_NAME := aarch64-linux-android
BINUTILS_ROOT := $(call get-binutils-root,$(NDK_ROOT),$(TOOLCHAIN_NAME))
-TOOLCHAIN_PREFIX := $(BINUTILS_ROOT)/bin/$(TOOLCHAIN_NAME)-
+TOOLCHAIN_ROOT := $(call get-toolchain-root,$(NDK_ROOT),$(TOOLCHAIN_NAME)-4.9)
+TOOLCHAIN_PREFIX := $(TOOLCHAIN_ROOT)/bin/$(TOOLCHAIN_NAME)-
TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
@@ -40,7 +41,7 @@
LLVM_TRIPLE := aarch64-none-linux-android
TARGET_CFLAGS := \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-ffunction-sections \
-funwind-tables \
@@ -51,8 +52,7 @@
-no-canonical-prefixes
TARGET_LDFLAGS += \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
- -L $(call get-gcclibs-path,$(NDK_ROOT),$(TOOLCHAIN_NAME)) \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-no-canonical-prefixes
diff --git a/build/core/toolchains/arm-linux-androideabi-clang3.6/setup.mk b/build/core/toolchains/arm-linux-androideabi-clang3.6/setup.mk
index 7945576..507c617 100644
--- a/build/core/toolchains/arm-linux-androideabi-clang3.6/setup.mk
+++ b/build/core/toolchains/arm-linux-androideabi-clang3.6/setup.mk
@@ -32,7 +32,8 @@
TOOLCHAIN_NAME := arm-linux-androideabi
BINUTILS_ROOT := $(call get-binutils-root,$(NDK_ROOT),$(TOOLCHAIN_NAME))
-TOOLCHAIN_PREFIX := $(BINUTILS_ROOT)/bin/$(TOOLCHAIN_NAME)-
+TOOLCHAIN_ROOT := $(call get-toolchain-root,$(NDK_ROOT),$(TOOLCHAIN_NAME)-4.9)
+TOOLCHAIN_PREFIX := $(TOOLCHAIN_ROOT)/bin/$(TOOLCHAIN_NAME)-
TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
@@ -42,7 +43,7 @@
#
TARGET_CFLAGS := \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-fpic \
-ffunction-sections \
-funwind-tables \
@@ -56,7 +57,7 @@
-fno-integrated-as
TARGET_LDFLAGS += \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-no-canonical-prefixes
ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
@@ -102,8 +103,6 @@
endif
GCCLIB_ROOT := $(call get-gcclibs-path,$(NDK_ROOT),$(TOOLCHAIN_NAME))
-TARGET_arm_LDFLAGS += -L $(GCCLIB_ROOT)/$(GCCLIB_SUBDIR)
-TARGET_thumb_LDFLAGS += -L $(GCCLIB_ROOT)/$(GCCLIB_SUBDIR)/thumb
TARGET_CFLAGS.neon := -mfpu=neon
diff --git a/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk b/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk
index 66518ce..4e45379 100644
--- a/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk
+++ b/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk
@@ -32,7 +32,8 @@
TOOLCHAIN_NAME := mips64el-linux-android
BINUTILS_ROOT := $(call get-binutils-root,$(NDK_ROOT),$(TOOLCHAIN_NAME))
-TOOLCHAIN_PREFIX := $(BINUTILS_ROOT)/bin/$(TOOLCHAIN_NAME)-
+TOOLCHAIN_ROOT := $(call get-toolchain-root,$(NDK_ROOT),$(TOOLCHAIN_NAME)-4.9)
+TOOLCHAIN_PREFIX := $(TOOLCHAIN_ROOT)/bin/$(TOOLCHAIN_NAME)-
TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
@@ -44,7 +45,7 @@
LLVM_TRIPLE := mips64el-none-linux-android
TARGET_CFLAGS := \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-fpic \
-fno-strict-aliasing \
@@ -58,8 +59,7 @@
-no-canonical-prefixes
TARGET_LDFLAGS += \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
- -L $(call get-gcclibs-path,$(NDK_ROOT),$(TOOLCHAIN_NAME)) \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-no-canonical-prefixes
diff --git a/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk b/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk
index 5bc796e..dc86826 100644
--- a/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk
+++ b/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk
@@ -32,7 +32,8 @@
TOOLCHAIN_NAME := mipsel-linux-android
BINUTILS_ROOT := $(call get-binutils-root,$(NDK_ROOT),$(TOOLCHAIN_NAME))
-TOOLCHAIN_PREFIX := $(BINUTILS_ROOT)/bin/$(TOOLCHAIN_NAME)-
+TOOLCHAIN_ROOT := $(call get-toolchain-root,$(NDK_ROOT),$(TOOLCHAIN_NAME)-4.9)
+TOOLCHAIN_PREFIX := $(TOOLCHAIN_ROOT)/bin/$(TOOLCHAIN_NAME)-
TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
@@ -44,7 +45,7 @@
LLVM_TRIPLE := mipsel-none-linux-android
TARGET_CFLAGS := \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-fpic \
-fno-strict-aliasing \
@@ -58,8 +59,7 @@
-no-canonical-prefixes
TARGET_LDFLAGS += \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
- -L $(call get-gcclibs-path,$(NDK_ROOT),$(TOOLCHAIN_NAME)) \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-no-canonical-prefixes
diff --git a/build/core/toolchains/x86-clang3.6/setup.mk b/build/core/toolchains/x86-clang3.6/setup.mk
index 1aa99f5..ac7c83d 100644
--- a/build/core/toolchains/x86-clang3.6/setup.mk
+++ b/build/core/toolchains/x86-clang3.6/setup.mk
@@ -32,7 +32,8 @@
TOOLCHAIN_NAME := i686-linux-android
BINUTILS_ROOT := $(call get-binutils-root,$(NDK_ROOT),$(TOOLCHAIN_NAME))
-TOOLCHAIN_PREFIX := $(BINUTILS_ROOT)/bin/$(TOOLCHAIN_NAME)-
+TOOLCHAIN_ROOT := $(call get-toolchain-root,$(NDK_ROOT),x86-4.9)
+TOOLCHAIN_PREFIX := $(TOOLCHAIN_ROOT)/bin/$(TOOLCHAIN_NAME)-
TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
@@ -40,7 +41,7 @@
LLVM_TRIPLE := i686-none-linux-android
TARGET_CFLAGS := \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-ffunction-sections \
-funwind-tables \
@@ -52,8 +53,7 @@
# Add and LDFLAGS for the target here
TARGET_LDFLAGS += \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
- -L $(call get-gcclibs-path,$(NDK_ROOT),$(TOOLCHAIN_NAME)) \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-no-canonical-prefixes
diff --git a/build/core/toolchains/x86_64-clang3.6/setup.mk b/build/core/toolchains/x86_64-clang3.6/setup.mk
index f424743..51e3245 100644
--- a/build/core/toolchains/x86_64-clang3.6/setup.mk
+++ b/build/core/toolchains/x86_64-clang3.6/setup.mk
@@ -32,7 +32,8 @@
TOOLCHAIN_NAME := x86_64-linux-android
BINUTILS_ROOT := $(call get-binutils-root,$(NDK_ROOT),$(TOOLCHAIN_NAME))
-TOOLCHAIN_PREFIX := $(BINUTILS_ROOT)/bin/$(TOOLCHAIN_NAME)-
+TOOLCHAIN_ROOT := $(call get-toolchain-root,$(NDK_ROOT),x86_64-4.9)
+TOOLCHAIN_PREFIX := $(TOOLCHAIN_ROOT)/bin/$(TOOLCHAIN_NAME)-
TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT)
TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT)
@@ -40,7 +41,7 @@
LLVM_TRIPLE := x86_64-none-linux-android
TARGET_CFLAGS := \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-ffunction-sections \
-funwind-tables \
@@ -51,8 +52,7 @@
-no-canonical-prefixes
TARGET_LDFLAGS += \
- -B $(call host-path,$(BINUTILS_ROOT))/$(TOOLCHAIN_NAME)/bin \
- -L $(call get-gcclibs-path,$(NDK_ROOT),$(TOOLCHAIN_NAME)) \
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_ROOT)) \
-target $(LLVM_TRIPLE) \
-no-canonical-prefixes
diff --git a/build/tools/package.py b/build/tools/package.py
index 53490f8..091cd64 100755
--- a/build/tools/package.py
+++ b/build/tools/package.py
@@ -107,12 +107,10 @@
]
old_layout = [
- ('binutils-{arch}-{host}', 'binutils/{triple}'),
('build', 'build'),
('cpufeatures', 'sources/android/cpufeatures'),
('gabixx', 'sources/cxx-stl/gabi++'),
('gcc-{arch}-{host}', 'toolchains/{toolchain}-4.9/prebuilt/{host}'),
- ('gcclibs-{arch}', 'gcclibs/{triple}'),
('gdbserver-{arch}', 'prebuilt/android-{arch}/gdbserver'),
('gnustl-4.9', 'sources/cxx-stl/gnu-libstdc++/4.9'),
('gtest', 'sources/third_party/googletest'),
