New packaging script for sources and binaries.
This patch introduces a new script that can generate tarballs
for emulator binaries and sources.
See distrib/package-release.sh --help for details.
Note that for SDK official builds, it is recommended to perform
the build inside of an Android platform tree instead, to let
the standalone build system pick the correct prebuild SDK
toolchains, which ensure the generated binaries are compatible
with older Linux releases.
+ Make android-rebuild.sh more verbose in case of failure and
fix a bug where the 64-bit unit test suite was launched with
Wine under Linux (even though we don't generate 64-bit
binaries for Windows yet).
+ Fix host toolchain probing in android-configure.sh to ensure
that rebuilding the sources from scratch works even when not
in the Android platform build.
Change-Id: Ida3182061940360b495c720d10c0ff9b4bcc3549
diff --git a/android-configure.sh b/android-configure.sh
index 5ebb99e..12ed942 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -103,14 +103,13 @@
# On Linux, try to use our prebuilt toolchain to generate binaries
# that are compatible with Ubuntu 8.04
if [ -z "$CC" -a -z "$OPTION_CC" -a "$HOST_OS" = linux ] ; then
- HOST_CC=`dirname $0`/../../prebuilts/tools/gcc-sdk/gcc
- if [ -f "$HOST_CC" ] ; then
- echo "Using prebuilt toolchain: $HOST_CC"
- CC="$HOST_CC"
+ PROBE_HOST_CC=`dirname $0`/../../prebuilts/tools/gcc-sdk/gcc
+ if [ -f "$PROBE_HOST_CC" ] ; then
+ echo "Using prebuilt toolchain: $PROBE_HOST_CC"
+ CC="$PROBE_HOST_CC"
fi
fi
-echo "OPTION_CC='$OPTION_CC'"
if [ -n "$OPTION_CC" ]; then
echo "Using specified C compiler: $OPTION_CC"
CC="$OPTION_CC"
@@ -441,7 +440,8 @@
if [ "$OPTION_IGNORE_AUDIO" = no ] ; then
echo "The $2 development files do not seem to be installed on this system"
echo "Are you missing the $4 package ?"
- echo "Correct the errors below and try again:"
+ echo "You can ignore this error with --ignore-audio, otherwise correct"
+ echo "the issue(s) below and try again:"
cat $TMPL
clean_exit
fi