Fix the tools and processor build for Android

android/run-checks.sh

 #!/bin/sh
 # Copyright (c) 2012 Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 445 matching lines @@
 
 # Extract architecture name from ABI
 case $ABI in
   armeabi*) ARCH=arm;;
   *) ARCH=$ABI;;
 esac
 
 # Extract GNU configuration name
 case $ARCH in
   arm) GNU_CONFIG=arm-linux-androideabi;;
+  x86) GNU_CONFIG=i686-linux-android;;
   *) GNU_CONFIG="$ARCH-linux-android";;
 esac
 
 # Generate standalone NDK toolchain installation
 NDK_STANDALONE="$TMPDIR/ndk-$ARCH-toolchain"
 echo "Generating NDK standalone toolchain installation"
 mkdir -p "$NDK_STANDALONE"
 run "$NDK_DIR/build/tools/make-standalone-toolchain.sh" \
       --arch="$ARCH" \
       --install-dir="$NDK_STANDALONE"
 fail_panic "Can't generate standalone NDK toolchain installation!"
 
-# Rebuild the client library with the auto-tools base build system.
-# Even though it's not going to be used, this checks that this still
-# works correctly.
-echo "Building client Android library with configure/make"
+# Rebuild the client library, processor and tools with the auto-tools based
+# build system. Even though it's not going to be used, this checks that this
+# still works correctly.
+echo "Building Android binaries with configure/make"
 TMPTARGET="$TMPDIR/target-local"
 (
   PATH="$NDK_STANDALONE/bin:$PATH"
   run mkdir "$TMPTARGET" &&
   run mkdir "$TMPDIR"/build-target &&
   run cd "$TMPDIR"/build-target &&
   run2 "$PROGDIR"/../configure --prefix="$TMPTARGET" \
-                             --host="$GNU_CONFIG" \
-                             --disable-tools \
-                             --disable-processor &&
+                             --host="$GNU_CONFIG" &&

[Mark Mentovai, 2012/08/21 16:12:28]

Alignment (existing problem, but as long as you’re touching the line…)

[digit, 2012/08/21 16:53:50]

Done.

   run2 make -j$NUM_JOBS install
 )
-fail_panic "Could not rebuild Android client library!"
+fail_panic "Could not rebuild Android binaries!"
 
 # Copy sources to temporary directory
 PROJECT_DIR=$TMPDIR/project
 dump "Copying test program sources to: $PROJECT_DIR"
 run cp -r "$TESTAPP_DIR" "$PROJECT_DIR" &&
 run rm -rf "$PROJECT_DIR/obj" &&
 run rm -rf "$PROJECT_DIR/libs"
 fail_panic "Could not copy test program sources to: $PROJECT_DIR"
 
 # Build the test program with ndk-build.
@@ skipping 134 matching lines @@
 
 if [ "$BAD_LOCATIONS" ]; then
   dump "ERROR: Generated stack trace doesn't contain valid source locations:"
   cat "$BUILD_LOG"
   echo "Bad locations are: $BAD_LOCATIONS"
   clean_exit 1
 fi
 
 echo "All clear! Congratulations."
 clean_exit 0