Allow target arch in tapas parameters.

For example:
$ tapas App1 App2 x86 userdebug

Change-Id: I19601a93484f70dac677d2d68033684db32e1321
This commit is contained in:
Ying Wang 2012-08-22 10:25:20 -07:00
parent f3b8659105
commit 67f0292011

View file

@ -1,6 +1,8 @@
function hmm() { function hmm() {
cat <<EOF cat <<EOF
Invoke ". build/envsetup.sh" from your shell to add the following functions to your environment: Invoke ". build/envsetup.sh" from your shell to add the following functions to your environment:
- lunch: lunch <product_name>-<build_variant>
- tapas: tapas [<App1> <App2> ...] [arm|x86|mips] [eng|userdebug|user]
- croot: Changes directory to the top of the tree. - croot: Changes directory to the top of the tree.
- m: Makes from the top of the tree. - m: Makes from the top of the tree.
- mm: Builds all of the modules in the current directory. - mm: Builds all of the modules in the current directory.
@ -532,13 +534,24 @@ complete -F _lunch lunch
# Run tapas with one ore more app names (from LOCAL_PACKAGE_NAME) # Run tapas with one ore more app names (from LOCAL_PACKAGE_NAME)
function tapas() function tapas()
{ {
local arch=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips)$'))
local variant=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$')) local variant=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$'))
local apps=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng)$')) local apps=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips)$'))
if [ $(echo $arch | wc -w) -gt 1 ]; then
echo "tapas: Error: Multiple build archs supplied: $arch"
return
fi
if [ $(echo $variant | wc -w) -gt 1 ]; then if [ $(echo $variant | wc -w) -gt 1 ]; then
echo "tapas: Error: Multiple build variants supplied: $variant" echo "tapas: Error: Multiple build variants supplied: $variant"
return return
fi fi
local product=full
case $arch in
x86) product=full_x86;;
mips) product=full_mips;;
esac
if [ -z "$variant" ]; then if [ -z "$variant" ]; then
variant=eng variant=eng
fi fi
@ -546,7 +559,7 @@ function tapas()
apps=all apps=all
fi fi
export TARGET_PRODUCT=full export TARGET_PRODUCT=$product
export TARGET_BUILD_VARIANT=$variant export TARGET_BUILD_VARIANT=$variant
export TARGET_BUILD_TYPE=release export TARGET_BUILD_TYPE=release
export TARGET_BUILD_APPS=$apps export TARGET_BUILD_APPS=$apps