------------------------------------------------------------ revno: 6456 committer: Juhani Toivonen <juhani.toivonen@xxxxxxxxxxxxxx> branch nick: trunk timestamp: Fri 2014-10-10 11:16:38 +0300 message: Remove unnecessary instructions on building the Android toolchain. The script and instuctions relied on setting a number of environment variables. The configure script now handles everything that was previously done through the environment variables. I removed the unnecessary instructions from the script and related documentation. modified: INSTALL doc/HOWTO.xml.in tools/prepare_android_toolchain.sh -- lp:hipl https://code.launchpad.net/~hipl-core/hipl/trunk Your team HIPL core team is subscribed to branch lp:hipl. To unsubscribe from this branch go to https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'INSTALL' --- INSTALL 2014-09-23 22:02:40 +0000 +++ INSTALL 2014-10-10 08:16:38 +0000 @@ -115,7 +115,7 @@ 4. Follow the instructions printed at the end of the script. 5. In the HIPL source tree, run: - export CC="${ANDROID_TOOLCHAIN}/bin/arm-linux-androideabi-gcc" + export CC="(path to android toolchain)/bin/arm-linux-androideabi-gcc" ./configure --enable-android --host=arm-linux \ --prefix=/usr --sysconfdir=/etc === modified file 'doc/HOWTO.xml.in' --- doc/HOWTO.xml.in 2014-09-23 22:02:40 +0000 +++ doc/HOWTO.xml.in 2014-10-10 08:16:38 +0000 @@ -280,7 +280,7 @@ steps to compile for Android are almost similar to normal Linux builds. You start with autoreconf --install; then you run the configure script: <programlisting> -CC=${ANDROID_TOOLCHAIN}/bin/arm-linux-androideabi-gcc +CC=(path to android toolchain)/bin/arm-linux-androideabi-gcc ./configure --enable-android --host=arm-linux \ --prefix=/usr --sysconfdir=/etc </programlisting> === modified file 'tools/prepare_android_toolchain.sh' --- tools/prepare_android_toolchain.sh 2014-10-01 13:02:17 +0000 +++ tools/prepare_android_toolchain.sh 2014-10-10 08:16:38 +0000 @@ -165,17 +165,9 @@ echo "" echo "" echo "The tools are now installed under $TOOLCHAIN_INSTALL_FOLDER" - echo "" - echo "Please run these commands now:" - echo "export NDK_ROOT=${NDK_ROOT}" - echo "export ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN}" - echo "export ANDROID_SYSROOT=${ANDROID_SYSROOT}" - echo "" - echo "We also recommend adding them to ${HOME}/.bashrc" - echo "so they will be ready for future builds." - echo "" - echo "Then in HIPL root run:" - + echo "Path to the toolchain is ${ANDROID_TOOLCHAIN}" + echo "" + echo "To configure HIPL for Android compilation, run:" echo "For Android >= 4.1: " \ ./configure --enable-android --host=arm-linux \ --prefix=/usr --sysconfdir=/etc \