Use a prebuilt GCC from the modular NDK.
Bug: http://b/23362228
Change-Id: Ide6809c4689357cb6c0d60fe7a8df0f066e1dcae
diff --git a/.gitignore b/.gitignore
index d952baf..a91ba34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
build.xml
/samples/
platforms/
-toolchains/*/prebuilt/
/ndk-stack*
/ndk-depends*
-prebuilt/
+/prebuilt/
diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh
deleted file mode 100755
index 1db66d8..0000000
--- a/build/tools/build-gcc.sh
+++ /dev/null
@@ -1,678 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2010 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 shell script is used to rebuild the gcc and toolchain binaries
-# for the Android NDK.
-#
-
-# include common function and variable definitions
-. `dirname $0`/prebuilt-common.sh
-
-PROGRAM_PARAMETERS="<src-dir> <ndk-dir> <toolchain>"
-
-PROGRAM_DESCRIPTION=\
-"Rebuild the gcc toolchain prebuilt binaries for the Android NDK.
-
-Where <src-dir> is the location of toolchain sources, <ndk-dir> is
-the top-level NDK installation path and <toolchain> is the name of
-the toolchain to use (e.g. arm-linux-androideabi-4.9)."
-
-RELEASE=`date +%Y%m%d`
-BUILD_OUT=$TMPDIR/build/toolchain
-OPTION_BUILD_OUT=
-register_var_option "--build-out=<path>" OPTION_BUILD_OUT "Set temporary build directory"
-
-# Note: platform API level 9 or higher is needed for proper C++ support
-register_var_option "--platform=<name>" PLATFORM "Specify platform name"
-
-OPTION_SYSROOT=
-register_var_option "--sysroot=<path>" OPTION_SYSROOT "Specify sysroot directory directly"
-
-GDB_VERSION=$DEFAULT_GDB_VERSION
-EXPLICIT_GDB_VERSION=
-register_option "--gdb-version=<version>" do_gdb_version "Specify gdb version" "$GDB_VERSION"
-do_gdb_version () {
- GDB_VERSION=$1
- EXPLICIT_GDB_VERSION=true
-}
-
-BINUTILS_VERSION=$DEFAULT_BINUTILS_VERSION
-EXPLICIT_BINUTILS_VERSION=
-register_option "--binutils-version=<version>" do_binutils_version "Specify binutils version" "$BINUTILS_VERSION"
-do_binutils_version () {
- BINUTILS_VERSION=$1
- EXPLICIT_BINUTILS_VERSION=true
-}
-
-GMP_VERSION=$DEFAULT_GMP_VERSION
-register_var_option "--gmp-version=<version>" GMP_VERSION "Specify gmp version"
-
-MPFR_VERSION=$DEFAULT_MPFR_VERSION
-register_var_option "--mpfr-version=<version>" MPFR_VERSION "Specify mpfr version"
-
-MPC_VERSION=$DEFAULT_MPC_VERSION
-register_var_option "--mpc-version=<version>" MPC_VERSION "Specify mpc version"
-
-CLOOG_VERSION=$DEFAULT_CLOOG_VERSION
-register_var_option "--cloog-version=<version>" CLOOG_VERSION "Specify cloog version"
-
-ISL_VERSION=$DEFAULT_ISL_VERSION
-register_var_option "--isl-version=<version>" ISL_VERSION "Specify ISL version"
-
-PPL_VERSION=$DEFAULT_PPL_VERSION
-register_var_option "--ppl-version=<version>" PPL_VERSION "Specify ppl version"
-
-WITH_PYTHON=
-register_var_option "--with-python=<path/to/python-config.sh>" WITH_PYTHON "Specify python config script, or prebuilt"
-
-PACKAGE_DIR=
-register_var_option "--package-dir=<path>" PACKAGE_DIR "Create archive tarball in specific directory"
-
-ENABLE_LANGUAGES="c,c++"
-register_var_option "--enable-languages=<name>" ENABLE_LANGUAGES "Experimental: specify which languages to build"
-
-register_jobs_option
-register_canadian_option
-register_try64_option
-
-extract_parameters "$@"
-
-prepare_canadian_toolchain $TMPDIR/build
-
-fix_option BUILD_OUT "$OPTION_BUILD_OUT" "build directory"
-setup_default_log_file $BUILD_OUT/config.log
-
-set_parameters ()
-{
- SRC_DIR="$1"
- NDK_DIR="$2"
- TOOLCHAIN="$3"
-
- # Check source directory
- #
- if [ -z "$SRC_DIR" ] ; then
- echo "ERROR: Missing source directory parameter. See --help for details."
- exit 1
- fi
-
- if [ ! -d "$SRC_DIR/gcc" ] ; then
- echo "ERROR: Source directory does not contain gcc sources: $SRC_DIR"
- exit 1
- fi
- SRC_DIR=`cd $SRC_DIR; pwd`
- log "Using source directory: $SRC_DIR"
-
- # Check NDK installation directory
- #
- if [ -z "$NDK_DIR" ] ; then
- echo "ERROR: Missing NDK directory parameter. See --help for details."
- exit 1
- fi
-
- if [ ! -d "$NDK_DIR" ] ; then
- mkdir -p $NDK_DIR
- if [ $? != 0 ] ; then
- echo "ERROR: Could not create target NDK installation path: $NDK_DIR"
- exit 1
- fi
- fi
- NDK_DIR=`cd $NDK_DIR; pwd`
- log "Using NDK directory: $NDK_DIR"
-
- # Check toolchain name
- #
- if [ -z "$TOOLCHAIN" ] ; then
- echo "ERROR: Missing toolchain name parameter. See --help for details."
- exit 1
- fi
-}
-
-set_parameters $PARAMETERS
-
-prepare_target_build
-
-parse_toolchain_name $TOOLCHAIN
-
-if [ -z "$PLATFORM" ]; then
- PLATFORM="android-"$(get_default_api_level_for_arch $ARCH)
-fi
-
-fix_sysroot "$OPTION_SYSROOT"
-
-check_toolchain_src_dir "$SRC_DIR"
-
-if [ ! -d $SRC_DIR/gdb/gdb-$GDB_VERSION ] ; then
- echo "ERROR: Missing gdb sources: $SRC_DIR/gdb/gdb-$GDB_VERSION"
- echo " Use --gdb-version=<version> to specify alternative."
- exit 1
-fi
-
-if [ -z "$EXPLICIT_BINUTILS_VERSION" ]; then
- BINUTILS_VERSION=$(get_default_binutils_version_for_gcc $TOOLCHAIN)
- dump "Auto-config: --binutils-version=$BINUTILS_VERSION"
-fi
-
-if [ ! -d $SRC_DIR/binutils/binutils-$BINUTILS_VERSION ] ; then
- echo "ERROR: Missing binutils sources: $SRC_DIR/binutils/binutils-$BINUTILS_VERSION"
- echo " Use --binutils-version=<version> to specify alternative."
- exit 1
-fi
-
-if [ -z "$EXPLICIT_GDB_VERSION" ]; then
- GDB_VERSION=$(get_default_gdb_version_for_gcc $TOOLCHAIN)
- dump "Auto-config: --gdb-version=$GDB_VERSION"
-fi
-
-if [ ! -d $SRC_DIR/gdb/gdb-$GDB_VERSION ] ; then
- echo "ERROR: Missing gdb sources: $SRC_DIR/gdb/gdb-$GDB_VERSION"
- echo " Use --gdb-version=<version> to specify alternative."
- exit 1
-fi
-
-if [ ! -z "$WITH_PYTHON" ] ; then
- if [ "$WITH_PYTHON" = "prebuilt" ] ; then
- WITH_PYTHON_SCRIPT="$ANDROID_NDK_ROOT/prebuilt/$HOST_TAG/bin/python-config.sh"
- fi
- if [ ! -f "$WITH_PYTHON_SCRIPT" ] ; then
- echo "ERROR: --with-python ($WITH_PYTHON_SCRIPT)"
- echo " Does not exist!"
- exit 1
- else
- WITH_PYTHON="--with-python=$WITH_PYTHON_SCRIPT"
- fi
-fi
-
-fix_option MPFR_VERSION "$OPTION_MPFR_VERSION" "mpfr version"
-if [ ! -f $SRC_DIR/mpfr/mpfr-$MPFR_VERSION.tar.bz2 ] ; then
- echo "ERROR: Missing mpfr sources: $SRC_DIR/mpfr/mpfr-$MPFR_VERSION.tar.bz2"
- echo " Use --mpfr-version=<version> to specify alternative."
- exit 1
-fi
-
-if [ "$PACKAGE_DIR" ]; then
- mkdir -p "$PACKAGE_DIR"
- fail_panic "Could not create package directory: $PACKAGE_DIR"
-fi
-
-set_toolchain_ndk $NDK_DIR $TOOLCHAIN
-
-if [ "$MINGW" != "yes" -a "$DARWIN" != "yes" ] ; then
- dump "Using C compiler: $CC"
- dump "Using C++ compiler: $CXX"
-fi
-
-rm -rf $BUILD_OUT
-mkdir -p $BUILD_OUT
-
-# Location where the toolchain license files are
-TOOLCHAIN_LICENSES=$ANDROID_NDK_ROOT/build/tools/toolchain-licenses
-
-# Without option "--sysroot" (and its variations), GCC will attempt to
-# search path specified by "--with-sysroot" at build time for headers/libs.
-# Path at --with-sysroot contains minimal headers and libs to boostrap
-# toolchain build, and it's not needed afterward (NOTE: NDK provides
-# sysroot at specified API level,and Android build explicit lists header/lib
-# dependencies.
-#
-# It's better to point --with-sysroot to local directory otherwise the
-# path may be found at compile-time and bad things can happen: eg.
-# 1) The path exists and contain incorrect headers/libs
-# 2) The path exists at remote server and blocks GCC for seconds
-# 3) The path exists but not accessible, which crashes GCC!
-#
-# For canadian build --with-sysroot has to be sub-directory of --prefix.
-# Put TOOLCHAIN_BUILD_PREFIX to BUILD_OUT which is in $TMPDIR by default,
-# and TOOLCHAIN_BUILD_SYSROOT underneath.
-
-TOOLCHAIN_BUILD_PREFIX=$BUILD_OUT/prefix
-TOOLCHAIN_BUILD_SYSROOT=$TOOLCHAIN_BUILD_PREFIX/sysroot
-dump "Sysroot : Copying: $SYSROOT --> $TOOLCHAIN_BUILD_SYSROOT"
-mkdir -p $TOOLCHAIN_BUILD_SYSROOT && (cd $SYSROOT && tar chf - *) | (cd $TOOLCHAIN_BUILD_SYSROOT && tar xf -)
-if [ $? != 0 ] ; then
- echo "Error while copying sysroot files. See $TMPLOG"
- exit 1
-fi
-
-# configure the toolchain
-#
-dump "Configure: $TOOLCHAIN toolchain build"
-# Old versions of the toolchain source packages placed the
-# configure script at the top-level. Newer ones place it under
-# the build directory though. Probe the file system to check
-# this.
-BUILD_SRCDIR=$SRC_DIR/build
-if [ ! -d $BUILD_SRCDIR ] ; then
- BUILD_SRCDIR=$SRC_DIR
-fi
-OLD_ABI="${ABI}"
-export CC CXX
-export CFLAGS_FOR_TARGET="$ABI_CFLAGS_FOR_TARGET"
-export CXXFLAGS_FOR_TARGET="$ABI_CXXFLAGS_FOR_TARGET"
-# Needed to build a 32-bit gmp on 64-bit systems
-export ABI=$HOST_GMP_ABI
-
-# Note that the following flags only apply for "build" in canadian
-# -Wno-error is needed because our gdb-6.6 sources use -Werror by default
-# and fail to build with recent GCC versions.
-CFLAGS_FOR_BUILD="-O2 -s -Wno-error"
-LDFLAGS_FOR_BUILD=
-
-if [ "$MINGW" = "yes" ] ; then
- CFLAGS_FOR_BUILD=$CFLAGS_FOR_BUILD" -D__USE_MINGW_ANSI_STDIO=1"
-fi
-
-CFLAGS="$CFLAGS_FOR_BUILD $HOST_CFLAGS"
-LDFLAGS="$LDFLAGS_FOR_BUILD $HOST_LDFLAGS"
-
-export CFLAGS LDFLAGS CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD
-
-# This extra flag is used to slightly speed up the build
-EXTRA_CONFIG_FLAGS="--disable-bootstrap"
-
-if [ "$DARWIN" = "yes" ]; then
- # Disable plugin because in canadian cross build, plugin gengtype
- # will be incorrectly linked with build's library and fails.
- # ToDo
- EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --disable-plugin"
-else
- EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-plugins"
-fi
-
-# Enable OpenMP
-case "$TOOLCHAIN" in
- *) EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-libgomp" ;;
-esac
-
-# Enable indirect functions.
-EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-gnu-indirect-function"
-
-# Disable libcilkrts which needs C++ for now, because libstdlibc++ in NDK is
-# built separately...
-case "$TOOLCHAIN" in
- x86*-4.9) EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --disable-libcilkrts"
-esac
-
-# Disable libsanitizer (which depends on libstdc++ built separately) for now
-EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --disable-libsanitizer"
-
-# Enable Gold
-
-ENABLE_GOLD_FLAGS=
-case "$TOOLCHAIN" in
- # Note that only ARM/X86 >= GCC 4.6 and AARCH64 >= GCC 4.9 are supported
- mips*)
- # Don't use gold for mips/mips64.
- ;;
- aarch64*)
- # Enable ld.gold but ld.bfd remain the default
- ENABLE_GOLD_FLAGS="--enable-gold --enable-ld=default"
- ;;
- *)
- # Enable ld.gold as default
- ENABLE_GOLD_FLAGS="--enable-gold=default"
- ;;
-esac
-
-# Current mingw has an internal compiler error when building gold.
-# Bug: http://b/22045105
-if [ "$MINGW" = "yes" ]; then
- ENABLE_GOLD_FLAGS=
-fi
-
-EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" "$ENABLE_GOLD_FLAGS
-
-# We're not using gold for mips yet, and there is no support for threaded
-# linking on Windows (no pthreads).
-if [ "$TOOLCHAIN" != mips* -a "$MINGW" != "yes" ]; then
- EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-threads"
-fi
-
-# Enable Graphite
-EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-graphite=yes --with-cloog-version=$CLOOG_VERSION --with-isl-version=$ISL_VERSION"
-
-# Enable linker option -eh-frame-hdr also for static executable
-EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-eh-frame-hdr-for-static"
-
-# Enable aarch64 workaround for Cortex-A53 Erratum number 835769
-case "$TOOLCHAIN" in
- aarch64*-4.9) EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-fix-cortex-a53-835769"
-esac
-
-MAY_FAIL_DUE_TO_RACE_CONDITION=
-if [ "$MINGW" = "yes" -o "$DARWIN" = "yes" ]; then
- MAY_FAIL_DUE_TO_RACE_CONDITION=yes
-fi
-
-# hack to use different set of sources
-CONFIGURE_GCC_VERSION=$GCC_VERSION
-case "$TOOLCHAIN" in
- *4.9l)
- CONFIGURE_GCC_VERSION=4.9l
- ;;
-esac
-
-# Build GNU sed so the configure script works for MIPS/MIPS64 on Darwin.
-# http://b/22099482
-cd $BUILD_OUT && run $SRC_DIR/sed/configure
-if [ $? != 0 ] ; then
- dump "Error while trying to configure sed. See $TMPLOG"
- exit 1
-fi
-run make -j$NUM_JOBS
-if [ $? != 0 ] ; then
- dump "Error while trying to build sed. See $TMPLOG"
- exit 1
-fi
-
-# Put our freshly-built GNU sed ahead of the system one on the path.
-export PATH=$BUILD_OUT/sed/:$PATH
-
-cd $BUILD_OUT && run \
-$BUILD_SRCDIR/configure --target=$ABI_CONFIGURE_TARGET \
- --enable-initfini-array \
- --host=$ABI_CONFIGURE_HOST \
- --build=$ABI_CONFIGURE_BUILD \
- --disable-nls \
- --prefix=$TOOLCHAIN_BUILD_PREFIX \
- --with-sysroot=$TOOLCHAIN_BUILD_SYSROOT \
- --with-binutils-version=$BINUTILS_VERSION \
- --with-mpfr-version=$MPFR_VERSION \
- --with-mpc-version=$MPC_VERSION \
- --with-gmp-version=$GMP_VERSION \
- --with-gcc-version=$CONFIGURE_GCC_VERSION \
- --with-gdb-version=$GDB_VERSION \
- $WITH_PYTHON \
- --with-gxx-include-dir=$TOOLCHAIN_BUILD_PREFIX/include/c++/$GCC_VERSION \
- --with-bugurl=$DEFAULT_ISSUE_TRACKER_URL \
- --enable-languages=$ENABLE_LANGUAGES \
- $EXTRA_CONFIG_FLAGS \
- $ABI_CONFIGURE_EXTRA_FLAGS
-if [ $? != 0 ] ; then
- dump "Error while trying to configure toolchain build. See $TMPLOG"
- exit 1
-fi
-
-ABI="$OLD_ABI"
-# build the toolchain
-dump "Building : $TOOLCHAIN toolchain [this can take a long time]."
-cd $BUILD_OUT
-export CC CXX
-export ABI=$HOST_GMP_ABI
-export NUM_JOBS
-
-while [ -n "1" ]; do
- run make -j$NUM_JOBS
- if [ $? = 0 ] ; then
- break
- else
- if [ "$MAY_FAIL_DUE_TO_RACE_CONDITION" = "yes" ] ; then
- # Unfortunately, there is a bug in the GCC build scripts that prevent
- # parallel mingw/darwin canadian cross builds to work properly on some
- # multi-core machines (but not all, sounds like a race condition). Detect
- # this and restart in less parallelism, until -j1 also fail
- NUM_JOBS=$((NUM_JOBS/2))
- export NUM_JOBS
- if [ $NUM_JOBS -lt 1 ] ; then
- echo "Error while building mingw/darwin toolchain. See $TMPLOG"
- exit 1
- fi
- dump "Parallel canadian build failed - continuing in less parallelism -j$NUM_JOBS"
- else
- echo "Error while building toolchain. See $TMPLOG"
- exit 1
- fi
- fi
-done
-
-ABI="$OLD_ABI"
-
-# install the toolchain to its final location.
-dump "Install : $TOOLCHAIN toolchain binaries."
-cd $BUILD_OUT && run make install
-if [ $? != 0 ] ; then
- # try "-j1", eg. for aarch64-linux-android-4.8 with libatomic may fail to install due to race condition (missing prefix/lib/../lib64/./libiberty.an)
- NUM_JOBS=1
- export NUM_JOBS
- run make install -j$NUM_JOBS
- if [ $? != 0 ] ; then
- echo "Error while installing toolchain. See $TMPLOG"
- exit 1
- fi
-fi
-
-unwind_library_for_abi ()
-{
- local ABI="$1"
- local BASE_DIR OBJS UNWIND_OBJS
-
- case $ABI in
- armeabi)
- BASE_DIR="$BUILD_OUT/gcc-$CONFIGURE_GCC_VERSION/$ABI_CONFIGURE_TARGET/libgcc/"
- OBJS="unwind-arm.o \
- libunwind.o \
- pr-support.o \
- unwind-c.o"
- ;;
- armeabi-v7a)
- BASE_DIR="$BUILD_OUT/gcc-$CONFIGURE_GCC_VERSION/$ABI_CONFIGURE_TARGET/armv7-a/libgcc/"
- OBJS="unwind-arm.o \
- libunwind.o \
- pr-support.o \
- unwind-c.o"
- ;;
- armeabi-v7a-hard)
- BASE_DIR="$BUILD_OUT/gcc-$CONFIGURE_GCC_VERSION/$ABI_CONFIGURE_TARGET/armv7-a/hard/libgcc/"
- OBJS="unwind-arm.o \
- libunwind.o \
- pr-support.o \
- unwind-c.o"
- ;;
- x86|mips|mips32r6)
- BASE_DIR="$BUILD_OUT/gcc-$CONFIGURE_GCC_VERSION/$ABI_CONFIGURE_TARGET/libgcc/"
- OBJS="unwind-c.o \
- unwind-dw2-fde-dip.o \
- unwind-dw2.o"
- ;;
- arm64-v8a|x86_64|mips64)
- BASE_DIR="$BUILD_OUT/gcc-$CONFIGURE_GCC_VERSION/$ABI_CONFIGURE_TARGET/libgcc/"
- OBJS="unwind-c.o \
- unwind-dw2-fde-dip.o \
- unwind-dw2.o"
- ;;
- esac
-
- for OBJ in $OBJS; do
- UNWIND_OBJS=$UNWIND_OBJS" $BASE_DIR/$OBJ"
- done
- echo $UNWIND_OBJS
-}
-
-# Create libgccunwind.a for app linking
-# $1: arch name
-# $2: NDK_DIR
-create_unwind_library ()
-{
- local ARCH="$1"
- local NDK_DIR="$2"
- local ABIS="$(commas_to_spaces $(convert_archs_to_abis $ARCH))"
- local ABI UNWIND_OBJS UNWIND_LIB
- for ABI in $ABIS; do
- UNWIND_OBJS=$(unwind_library_for_abi $ABI)
- UNWIND_LIB_DIR="$NDK_DIR/$GCCUNWIND_SUBDIR/libs/$ABI/"
- run mkdir -p $UNWIND_LIB_DIR
- run ar crsD $UNWIND_LIB_DIR/libgccunwind.a $UNWIND_OBJS
- done
-}
-
-# Only create libgccunwind.a when building default version of gcc
-DEFAULT_GCC_VERSION=$(get_default_gcc_version_for_arch $ARCH)
-if [ "$HOST_OS" = "linux" -a "$GCC_VERSION" = "$DEFAULT_GCC_VERSION" ]; then
- run create_unwind_library $ARCH $NDK_DIR
-fi
-
-# copy to toolchain path
-run copy_directory "$TOOLCHAIN_BUILD_PREFIX" "$TOOLCHAIN_PATH"
-
-if [ "$MINGW" = "yes" -o "$DARWIN" = "yes" ] ; then
- # For some reasons, libraries in $ABI_CONFIGURE_TARGET (*) are not installed.
- # Hack here to copy them over.
- # (*) FYI: libgcc.a and libgcov.a not installed there in the first place
- INSTALL_TARGET_LIB_PATH="$BUILD_OUT/host-$ABI_CONFIGURE_BUILD/install/$ABI_CONFIGURE_TARGET/lib"
- TOOLCHAIN_TARGET_LIB_PATH="$TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib"
- (cd "$INSTALL_TARGET_LIB_PATH" &&
- find . \( -name "*.a" -o -name "*.la" -o -name "*.spec" \) -exec install -D "{}" "$TOOLCHAIN_TARGET_LIB_PATH/{}" \;)
-fi
-
-# don't forget to copy the GPL and LGPL license files
-run cp -f $TOOLCHAIN_LICENSES/COPYING* $TOOLCHAIN_PATH
-
-# remove some unneeded files
-run rm -f $TOOLCHAIN_PATH/bin/*-gccbug
-run rm -f $TOOLCHAIN_PATH/bin/*gdbtui$HOST_EXE
-run rm -f $TOOLCHAIN_PATH/bin/*-run$HOST_EXE
-run rm -rf $TOOLCHAIN_PATH/info
-run rm -rf $TOOLCHAIN_PATH/man
-run rm -rf $TOOLCHAIN_PATH/share/info
-run rm -rf $TOOLCHAIN_PATH/share/man
-run rm -rf $TOOLCHAIN_PATH/lib/gcc/$ABI_CONFIGURE_TARGET/*/install-tools
-run rm -rf $TOOLCHAIN_PATH/lib/gcc/$ABI_CONFIGURE_TARGET/*/plugin
-run rm -rf $TOOLCHAIN_PATH/libexec/gcc/$ABI_CONFIGURE_TARGET/*/install-tools
-run rm -rf $TOOLCHAIN_PATH/lib/libiberty.a
-run rm -rf $TOOLCHAIN_PATH/lib32/libiberty.a
-run rm -rf $TOOLCHAIN_PATH/lib64/libiberty.a
-run rm -rf $TOOLCHAIN_PATH/lib/x86_64/libiberty.a
-run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/libiberty.a
-run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/*/libiberty.a
-run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/*/*/libiberty.a
-find $TOOLCHAIN_PATH -name "*.la" -exec rm -f {} \;
-# Remove host install in cross compilation
-if [ "$ABI_CONFIGURE_HOST" != "$ABI_CONFIGURE_TARGET" ]; then
- run rm -rf "$TOOLCHAIN_PATH/$ABI_CONFIGURE_HOST"
-fi
-# remove sysroot
-run rm -rf "$TOOLCHAIN_PATH/sysroot"
-
-# Remove libstdc++ for now (will add it differently later)
-# We had to build it to get libsupc++ which we keep.
-run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/libstdc++.*
-run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/*/libstdc++.*
-run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/include/c++
-
-# strip binaries to reduce final package size
-test -z "$STRIP" && STRIP=strip
-# because libpython is statically linked to GDB, it introduces symbols
-# that are only used by Python modules that must not be stripped. This
-# is not true of Windows which dynamically links to Python.
-if [ "$MINGW" = "yes" ] ; then
- run $STRIP $TOOLCHAIN_PATH/bin/*
-else
- find $TOOLCHAIN_PATH/bin -type f -not -name "*gdb" \
- | while read EXECUTABLE; do run $STRIP "$EXECUTABLE"; done
-fi
-run $STRIP $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/bin/*
-run $STRIP $TOOLCHAIN_PATH/libexec/gcc/*/*/cc1$HOST_EXE
-run $STRIP $TOOLCHAIN_PATH/libexec/gcc/*/*/cc1plus$HOST_EXE
-run $STRIP $TOOLCHAIN_PATH/libexec/gcc/*/*/collect2$HOST_EXE
-run $STRIP $TOOLCHAIN_PATH/libexec/gcc/*/*/lto*$HOST_EXE
-
-# Some of the files should really be links to save space.
-# This is mostly to reduce the size of the Windows zip archives,
-# since:
-# - The toolchain install script actually use hard-links
-# - Tar automatically detects hard links and will only store a
-# single copy of each file anyway.
-
-# $1: Source file (will be changed to a link)
-# $2: Destination (relative to source).
-do_relink () {
- log "Relink: $1 --> $2"
- local BASENAME DIRNAME
- DIRNAME=$(dirname "$1")
- BASENAME=$(basename "$1")
- ( cd "$DIRNAME" && rm -f "$BASENAME" && ln -s "$2" "$BASENAME" )
- fail_panic "Can't relink $1 to $2"
-}
-
-# <config>/bin/<name> should point to ../../<config>-<name>
-LINK_FILES=$(cd $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/bin && ls * 2>/dev/null)
-for LINK_FILE in $LINK_FILES; do
- do_relink $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/bin/$LINK_FILE ../../bin/$ABI_CONFIGURE_TARGET-$LINK_FILE
-done
-
-# $1: Source file prefix (e.g. 'c++')
-# $2: Destination file prefix (e.g. 'g++')
-# $3: Alternative file prefix if $2 doesn't exist (eg. ld.bfd)
-do_relink_bin () {
- local DST_FILE=$2
- if [ ! -f "$TOOLCHAIN_PATH/bin/$ABI_CONFIGURE_TARGET-$DST_FILE$HOST_EXE" ]; then
- DST_FILE=$3
- fi
- if [ ! -f "$TOOLCHAIN_PATH/bin/$ABI_CONFIGURE_TARGET-$DST_FILE$HOST_EXE" ]; then
- echo "ERROR: Can't relink $1 to $DST_FILE because $DST_FILE doesn't exist"
- exit 1
- fi
- do_relink \
- $TOOLCHAIN_PATH/bin/$ABI_CONFIGURE_TARGET-$1$HOST_EXE \
- $ABI_CONFIGURE_TARGET-$DST_FILE$HOST_EXE
-}
-
-do_relink_bin c++ g++
-do_relink_bin gcc-$GCC_VERSION gcc
-# symlink ld to either ld.gold or ld.bfd
-case "$TOOLCHAIN" in
- aarch64*)
- # Don't make ld.gold as default for now because it's new
- do_relink_bin ld ld.bfd ld.gold
- ;;
- *)
- do_relink_bin ld ld.gold ld.bfd
- ;;
-esac
-
-# copy SOURCES file if present
-if [ -f "$SRC_DIR/SOURCES" ]; then
- cp "$SRC_DIR/SOURCES" "$TOOLCHAIN_PATH/SOURCES"
-fi
-
-# check GLIBC/GLBICXX symbols
-if [ "$HOST_OS" = "linux" ]; then
- SUBDIR=$(get_toolchain_install_subdir $TOOLCHAIN $HOST_TAG)
- $ANDROID_NDK_ROOT/build/tools/check-glibc.sh $NDK_DIR/$SUBDIR
-fi
-
-if [ "$PACKAGE_DIR" ]; then
- ARCHIVE="$TOOLCHAIN-$HOST_TAG.tar.bz2"
- SUBDIR=$(get_toolchain_install_subdir $TOOLCHAIN $HOST_TAG)
- dump "Packaging $ARCHIVE"
- pack_archive "$PACKAGE_DIR/$ARCHIVE" "$NDK_DIR" "$SUBDIR"
- # package libgccunwind.a
- if [ "$HOST_OS" = "linux" -a "$GCC_VERSION" = "$DEFAULT_GCC_VERSION" ]; then
- ABIS=$(commas_to_spaces $(convert_archs_to_abis $ARCH))
- for ABI in $ABIS; do
- FILES="$GCCUNWIND_SUBDIR/libs/$ABI/libgccunwind.a"
- PACKAGE="$PACKAGE_DIR/libgccunwind-libs-$ABI.tar.bz2"
- log "Packaging: $PACKAGE"
- pack_archive "$PACKAGE" "$NDK_DIR" "$FILES"
- fail_panic "Could not package $ABI libgccunwind binaries!"
- dump "Packaging: $PACKAGE"
- done
- fi
-fi
-
-dump "Done."
-if [ -z "$OPTION_BUILD_OUT" ] ; then
- rm -rf $BUILD_OUT
-fi
diff --git a/build/tools/build-gdbserver.sh b/build/tools/build-gdbserver.sh
index d0889cd..2585a6a 100755
--- a/build/tools/build-gdbserver.sh
+++ b/build/tools/build-gdbserver.sh
@@ -130,7 +130,7 @@
prepare_target_build
parse_toolchain_name $TOOLCHAIN
-check_toolchain_install $NDK_DIR $TOOLCHAIN
+check_toolchain_install $ANDROID_BUILD_TOP/prebuilts/ndk/current $TOOLCHAIN
if [ -z "$PLATFORM" ]; then
PLATFORM="android-"$(get_default_api_level_for_arch $ARCH)
diff --git a/build/tools/build-gnu-libstdc++.sh b/build/tools/build-gnu-libstdc++.sh
index 05fc2ef..896673c 100755
--- a/build/tools/build-gnu-libstdc++.sh
+++ b/build/tools/build-gnu-libstdc++.sh
@@ -140,7 +140,7 @@
ARCH=$(convert_abi_to_arch $ABI)
for TAG in $HOST_TAG_LIST; do
- BINPREFIX=$NDK_DIR/$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)
+ BINPREFIX=$ANDROID_BUILD_TOP/prebuilts/ndk/current/$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)
if [ -f ${BINPREFIX}gcc ]; then
break;
fi
diff --git a/build/tools/build-host-prebuilts.sh b/build/tools/build-host-prebuilts.sh
index 735ebbb..8b7389f 100755
--- a/build/tools/build-host-prebuilts.sh
+++ b/build/tools/build-host-prebuilts.sh
@@ -281,26 +281,6 @@
fail_panic "Windows toolbox build failure!"
fi
- # Then the toolchains
- for ARCH in $ARCHS; do
- if [ "$GCC_VERSION_LIST" != "default" ]; then
- VERSIONS=$(spaces_to_commas $GCC_VERSION_LIST)
- TOOLCHAIN_NAMES=$(get_toolchain_name_list_for_arch $ARCH $VERSIONS)
- else
- TOOLCHAIN_NAMES=$(get_toolchain_name_list_for_arch $ARCH)
- fi
- if [ -z "$TOOLCHAIN_NAMES" ]; then
- echo "ERROR: Toolchains: "$(spaces_to_commas $GCC_VERSION_LIST)" are not available for arch: $ARCH"
- exit 1
- fi
-
- for TOOLCHAIN_NAME in $TOOLCHAIN_NAMES; do
- echo "Building $SYSNAME toolchain for $ARCH architecture: $TOOLCHAIN_NAME"
- run $BUILDTOOLS/build-gcc.sh "$SRC_DIR" "$NDK_DIR" $TOOLCHAIN_NAME $TOOLCHAIN_FLAGS --with-python=prebuilt -j$BUILD_NUM_CPUS
- fail_panic "Could not build $TOOLCHAIN_NAME-$SYSNAME!"
- done
- done
-
echo "Packaging $SYSNAME LLVM"
PACKAGE_ARG=
if [ -n "$PACKAGE_DIR" ]; then
diff --git a/build/tools/builder-funcs.sh b/build/tools/builder-funcs.sh
index b2a7256..6750092 100644
--- a/build/tools/builder-funcs.sh
+++ b/build/tools/builder-funcs.sh
@@ -534,7 +534,7 @@
fi
fi
for TAG in $HOST_TAG $HOST_TAG32; do
- BINPREFIX=$NDK_DIR/$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)
+ BINPREFIX=$ANDROID_BUILD_TOP/prebuilts/ndk/current/$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)
if [ -f ${BINPREFIX}gcc ]; then
break;
fi
diff --git a/build/tools/dev-cleanup.sh b/build/tools/dev-cleanup.sh
index 018c72f..9b0114d 100755
--- a/build/tools/dev-cleanup.sh
+++ b/build/tools/dev-cleanup.sh
@@ -34,7 +34,6 @@
# Remove generated directories
rm -rf $DIR/platforms
-rm -rf $DIR/toolchains/*/prebuilt
rm -rf $DIR/samples
rm -rf $DIR/prebuilt
diff --git a/build/tools/gen-platforms.sh b/build/tools/gen-platforms.sh
index 60fb2e2..fe9caf7 100755
--- a/build/tools/gen-platforms.sh
+++ b/build/tools/gen-platforms.sh
@@ -373,7 +373,7 @@
fi
for TAG in $HOST_TAG $HOST_TAG32; do
- TOOLCHAIN_PREFIX="$NDK_DIR/$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)"
+ TOOLCHAIN_PREFIX="$ANDROID_BUILD_TOP/prebuilts/ndk/current/$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)"
TOOLCHAIN_PREFIX=${TOOLCHAIN_PREFIX%-}
CC="$TOOLCHAIN_PREFIX-gcc"
if [ -f "$CC" ]; then
