android-ide · antiego906 · Aug 4, 2015 · Aug 4, 2015 · Aug 5, 2015 · Aug 5, 2015
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,51 @@
 [submodule "busybox"]
 	path = busybox
 	url = git@github.com:android-ide/busybox.git
+[submodule "toolchain/build"]
+	path = toolchain/build
+	url = git@github.com:android-ide/toolchain-build.git
+	branch = aide-ndk-gcc-4.9
+[submodule "toolchain/gcc"]
+	path = toolchain/gcc
+	url = git@github.com:android-ide/toolchain-gcc.git
+	branch = ndk-patches
+[submodule "toolchain/binutils"]
+	path = toolchain/binutils
+	url = git@github.com:android-ide/toolchain-binutils.git
+	branch = ndk-patches
+[submodule "toolchain/cloog"]
+	path = toolchain/cloog
+	url = git@github.com:android-ide/toolchain-cloog.git
+[submodule "toolchain/expat"]
+	path = toolchain/expat
+	url = git@github.com:android-ide/toolchain-expat.git
+[submodule "toolchain/gdb"]
+	path = toolchain/gdb
+	url = git@github.com:android-ide/toolchain-gdb.git
+[submodule "toolchain/gmp"]
+	path = toolchain/gmp
+	url = git@github.com:android-ide/toolchain-gmp.git
+[submodule "toolchain/isl"]
+	path = toolchain/isl
+	url = git@github.com:android-ide/toolchain-isl.git
+[submodule "toolchain/mpc"]
+	path = toolchain/mpc
+	url = git@github.com:android-ide/toolchain-mpc.git
+[submodule "toolchain/mpfr"]
+	path = toolchain/mpfr
+	url = git@github.com:android-ide/toolchain-mpfr.git
+[submodule "toolchain/ppl"]
+	path = toolchain/ppl
+	url = git@github.com:android-ide/toolchain-ppl.git
+[submodule "toolchain/sed"]
+	path = toolchain/sed
+	url = git@github.com:android-ide/toolchain-sed.git
+[submodule "toolchain/yasm"]
+	path = toolchain/yasm
+	url = git@github.com:android-ide/toolchain-yasm.git
+[submodule "platform/bionic"]
+	path = platform/bionic
+	url = git@github.com:android-ide/platform_bionic.git
+[submodule "platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8"]
+	path = platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8
+	url = git@github.com:android-ide/platform-prebuilts-gcc-linux-x86-host-x86_64-linux-glibc2.11-4.8.git
diff --git a/build-busybox-arm.sh b/build-busybox-arm.sh
diff --git a/build-busybox-x86.sh b/build-busybox-x86.sh
diff --git a/build-busybox.sh b/build-busybox.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+SCRIPTDIR=$(dirname $0)
+TOP=$(cd $SCRIPTDIR; pwd)
+API_LEVEL=14
+
+case "$1" in
+	arm)
+		ARCH=arm
+		ARCH_CROSS_COMPILE_PREFIX=arm-linux-androideabi-
+		ARCH_CFLAGS="-march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
+		ARCH_LDFLAGS="-march=armv7-a -Wl,--fix-cortex-a8"
+		;;
+	x86)
+		ARCH=x86
+		ARCH_CROSS_COMPILE_PREFIX=i686-linux-android-
+		ARCH_CFLAGS=
+		ARCH_LDFLAGS=
+		;;
+	*)
+		echo "First argument must be arm or x86."
+		exit
+		;;
+esac
+$ANDROID_NDK/build/tools/make_standalone_toolchain.py --arch $ARCH --api $API_LEVEL --install-dir /tmp/my-android-toolchain --force
+cd $TOP/busybox
+export PATH=/tmp/my-android-toolchain/bin:$PATH
+git clean -fdx
+make aide_defconfig
+make EXTRA_CFLAGS="-D__NDK_MAJOR__=15 -D__ANDROID_API__=$API_LEVEL $ARCH_CFLAGS" EXTRA_LDFLAGS="$ARCH_LDFLAGS" CROSS_COMPILE="$ARCH_CROSS_COMPILE_PREFIX"
diff --git a/build-toolchain-arm.sh b/build-toolchain-arm.sh
diff --git a/build-toolchain-x86.sh b/build-toolchain-x86.sh
diff --git a/build-toolchains.sh b/build-toolchains.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+SCRIPTDIR=$(dirname $0)
+TOP=$(cd $SCRIPTDIR; pwd)
+ANDROID_BUILD_TOP=$TOP
+NDK=$TOP/platform/ndk
+NDK_LOGFILE=/tmp/ndk-build.log
+export NDK NDK_LOGFILE ANDROID_BUILD_TOP
+rm -f $NDK_LOGFILE
+rm -f $TOP/ndk-prebuilts/*
+
+$NDK/build/tools/rebuild-all-prebuilt.sh --arch="arm x86" --systems=androidx86static --gcc-version-list=4.9 --llvm-version-list= --package-dir=$TOP/ndk-prebuilt $TOP/toolchain/
+
+$NDK/build/tools/rebuild-all-prebuilt.sh --arch="arm x86" --systems=androidarmstatic --gcc-version-list=4.9 --llvm-version-list= --no-gen-platforms --package-dir=$TOP/ndk-prebuilt $TOP/toolchain/
diff --git a/busybox b/busybox
diff --git a/download-toolchain.sh b/download-toolchain.sh
diff --git a/install-prerequisites-ubuntu.sh b/install-prerequisites-ubuntu.sh
@@ -4,4 +4,4 @@ SCRIPTDIR=$(dirname $0)
 TOP=$(cd $SCRIPTDIR; pwd)
 
 aptitude install git build-essential rsync bison flex curl texinfo libtinfo-dev \
-libncurses5-dev gcc-arm-linux-gnueabi g++-arm-linux-gnueabi xapt
+libncurses5-dev
diff --git a/ndk-prebuilt b/ndk-prebuilt
diff --git a/package-ndk-aide-release-arm.sh b/package-ndk-aide-release-arm.sh
@@ -11,11 +11,11 @@ tar xjf  $TOP/ndk-release/android-ndk-aide-linux-arm.tar.bz2
 rm -rf android-ndk-aide/{samples,docs,tests}
 for toolchain in android-ndk-aide/toolchains/*
 do
-  if [ "${toolchain}" != "android-ndk-aide/toolchains/arm-linux-androideabi-4.6" ]
+  if [ "${toolchain}" != "android-ndk-aide/toolchains/arm-linux-androideabi-4.9" -a "${toolchain}" != "android-ndk-aide/toolchains/x86-4.9" ]
   then
     rm -r ${toolchain}
   fi
 done
-tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-arm-$RELEASE.tar.bz2 android-ndk-aide/
+tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-arm-$RELEASE.tar.bz2 --hard-dereference android-ndk-aide/
 cp $TOP/busybox/busybox $TOP/ndk-aide-release/busybox-arm-$RELEASE
 cp $TOP/ndkinstall.sh $TOP/ndk-aide-release/ndkinstall.sh-$RELEASE
diff --git a/package-ndk-aide-release-x86.sh b/package-ndk-aide-release-x86.sh
@@ -11,11 +11,11 @@ tar xjf  $TOP/ndk-release/android-ndk-aide-linux-x86.tar.bz2
 rm -rf android-ndk-aide/{samples,docs,tests}
 for toolchain in android-ndk-aide/toolchains/*
 do
-  if [ "${toolchain}" != "android-ndk-aide/toolchains/x86-4.6" ]
+  if [ "${toolchain}" != "android-ndk-aide/toolchains/arm-linux-androideabi-4.9" -a "${toolchain}" != "android-ndk-aide/toolchains/x86-4.9" ]
   then
     rm -r ${toolchain}
   fi
 done
-tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-x86-$RELEASE.tar.bz2 android-ndk-aide/
+tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-x86-$RELEASE.tar.bz2 --hard-dereference android-ndk-aide/
 cp $TOP/busybox/busybox $TOP/ndk-aide-release/busybox-x86-$RELEASE
 cp $TOP/ndkinstall.sh $TOP/ndk-aide-release/ndkinstall.sh-$RELEASE
diff --git a/package-ndk-release-arm.sh b/package-ndk-release-arm.sh
@@ -6,4 +6,4 @@ NDK=$TOP/platform/ndk
 NDK_LOGFILE=/tmp/ndk-build.log
 export NDK NDK_LOGFILE NUM_JOBS
 rm $NDK_LOGFILE
-$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-arm --arch=arm --toolchains=arm-linux-androideabi-4.6 --out-dir=$TOP/ndk-release
+$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-arm --arch=arm,x86 --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --reduced --out-dir=$TOP/ndk-release
diff --git a/package-ndk-release-x86.sh b/package-ndk-release-x86.sh
@@ -6,4 +6,4 @@ NDK=$TOP/platform/ndk
 NDK_LOGFILE=/tmp/ndk-build.log
 export NDK NDK_LOGFILE NUM_JOBS
 rm $NDK_LOGFILE
-$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-x86 --arch=x86 --toolchains=x86-4.6 --out-dir=$TOP/ndk-release
+$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-x86 --arch=x86,arm --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --reduced --out-dir=$TOP/ndk-release
diff --git a/platform/bionic b/platform/bionic
diff --git a/platform/development b/platform/development
diff --git a/platform/ndk b/platform/ndk
diff --git a/platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6 b/platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6
diff --git a/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8 b/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8
diff --git a/toolchain/binutils b/toolchain/binutils
diff --git a/toolchain/build b/toolchain/build
diff --git a/toolchain/cloog b/toolchain/cloog
diff --git a/toolchain/expat b/toolchain/expat
diff --git a/toolchain/gcc b/toolchain/gcc
diff --git a/toolchain/gdb b/toolchain/gdb
diff --git a/toolchain/gmp b/toolchain/gmp
diff --git a/toolchain/isl b/toolchain/isl
diff --git a/toolchain/mpc b/toolchain/mpc
diff --git a/toolchain/mpfr b/toolchain/mpfr
diff --git a/toolchain/ppl b/toolchain/ppl
diff --git a/toolchain/sed b/toolchain/sed
diff --git a/toolchain/yasm b/toolchain/yasm
+ −		arm-gdbserver.tar.bz2
+ −		arm-linux-androideabi-4.9-linux-arm.tar.bz2
+ −		arm-linux-androideabi-4.9-linux-x86.tar.bz2
+ −		gabixx-libs-armeabi-g.tar.bz2
+ −		gabixx-libs-armeabi-v7a-g.tar.bz2
+ −		gabixx-libs-armeabi-v7a-hard-g.tar.bz2
+ −		gabixx-libs-armeabi-v7a.tar.bz2
+ −		gabixx-libs-armeabi.tar.bz2
+ −		gabixx-libs-x86-g.tar.bz2
+ −		gnu-libstdc++-headers-4.6.tar.bz2
+ −		gnu-libstdc++-headers-4.9.tar.bz2
+ −		gnu-libstdc++-libs-4.6-armeabi-v7a.tar.bz2
+ −		gnu-libstdc++-libs-4.6-armeabi.tar.bz2
+ −		gnu-libstdc++-libs-4.9-armeabi-g.tar.bz2
+ −		gnu-libstdc++-libs-4.9-armeabi-v7a-g.tar.bz2
+ −		gnu-libstdc++-libs-4.9-armeabi-v7a-hard-g.tar.bz2
+ −		gnu-libstdc++-libs-4.9-x86-g.tar.bz2
+ −		libcxx-libs-armeabi-g.tar.bz2
+ −		libcxx-libs-armeabi-v7a-g.tar.bz2
+ −		libcxx-libs-armeabi-v7a-hard-g.tar.bz2
+ −		libcxx-libs-x86-g.tar.bz2
+ −		libgccunwind-libs-armeabi-v7a-hard.tar.bz2
+ −		libgccunwind-libs-armeabi-v7a.tar.bz2
+ −		libgccunwind-libs-armeabi.tar.bz2
+ −		libgccunwind-libs-x86.tar.bz2
+ −		libportable-libs-armeabi-v7a.tar.bz2
+ −		libportable-libs-armeabi.tar.bz2
+ −		ndk-awk-linux-arm.tar.bz2
+ −		ndk-awk-linux-x86.tar.bz2
+ −		ndk-make-linux-arm.tar.bz2
+ −		ndk-make-linux-x86.tar.bz2
+ −		ndk-sed-linux-arm.tar.bz2
+ −		ndk-sed-linux-x86.tar.bz2
+ −		ndk-stack-linux-arm.tar.bz2
+ −		ndk-stack-linux-x86.tar.bz2
+ −		ndk-yasm-linux-x86.tar.bz2
+ −		platforms.tar.bz2
+ −		samples.tar.bz2
+ −		scan-build-view.tar.bz2
+ −		stlport-libs-armeabi-g.tar.bz2
+ −		stlport-libs-armeabi-v7a-g.tar.bz2
+ −		stlport-libs-armeabi-v7a-hard-g.tar.bz2
+ −		stlport-libs-armeabi-v7a.tar.bz2
+ −		stlport-libs-armeabi.tar.bz2
+ −		stlport-libs-x86-g.tar.bz2
+ −		x86-4.9-linux-arm.tar.bz2
+ −		x86-4.9-linux-x86.tar.bz2
+ −		x86-gdbserver.tar.bz2