Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix documentation for setting up inital build.

Give a better error if the "android" tool is not on the path.
  • Loading branch information...
commit 64d16cf32c78ce346313037ca95e4c3a164bd85c 1 parent ac99db3
Jack Palevich authored
Showing with 6 additions and 3 deletions.
  1. +1 −1  docs/Building.txt
  2. +5 −2 tools/update.sh
View
2  docs/Building.txt
@@ -35,7 +35,7 @@ Building ATE using ant
The first time you build using Ant you must run a one-time setup script
to set up the local.properties files for all the ant projects:
- tools/setup.sh
+ tools/update.sh
After that, you can build ATE by:
View
7 tools/update.sh
@@ -1,7 +1,10 @@
#!/bin/bash
# You have to run this once in order for ant builds to work
-# assumes the Android SDK tool "android" is on the path
+# Check that the Android SDK tool "android" is on the path
+
+ANDROID=android
+command -v "$ANDROID" >/dev/null 2>&1 || { echo >&2 "The $ANDROID tool is not on the current PATH. Aborting."; exit 1; }
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ATE_ROOT="$( cd $DIR/.. && pwd )"
@@ -13,5 +16,5 @@ PROJECT_FILES="$( find "$ATE_ROOT" -name project.properties )"
for PROJECT_FILE in $PROJECT_FILES
do
PROJECT_DIR="$( dirname "$PROJECT_FILE" )"
- android update project -p "$PROJECT_DIR"
+ $ANDROID update project -p "$PROJECT_DIR"
done
Please sign in to comment.
Something went wrong with that request. Please try again.