Skip to content

Updated abrc #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yhpark wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated abrc #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions abrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,8 @@ abrc_compile() {
# Figure out which platform in the SDK to use. If aapt is in the
# PATH then we'll use that, otherwise the highest version platform
# is used.
PLATFORM_SDK=`which aapt 2>&1`
if [ $? -ne 0 ]; then
# Aapt is not in the PATH. Use the highest numbered platform installed.
PLATFORM_SDK=$ANDROID_SDK/platforms/`ls -1 $ANDROID_SDK/platforms | sort --numeric-sort --reverse --field-separator=- --key=2 | head -n 1`
else
PLATFORM_SDK=`dirname $PLATFORM_SDK`
PLATFORM_SDK=`dirname $PLATFORM_SDK`
fi

PLATFORM_SDK=$ANDROID_SDK/platforms/`ls -1 $ANDROID_SDK/platforms | sort --numeric-sort --reverse --field-separator=- --key=2 | head -n 1`


PROJECT_DIR=$1
shift
Expand All @@ -126,7 +119,7 @@ abrc_compile() {
RESOURCE_ZIP=`mktemp -u /tmp/resources-XXXXXXXXXX`.zip

echo "Using aapt to compile resources to $RESOURCE_ZIP"
$PLATFORM_SDK/tools/aapt package -f -M $PROJECT_DIR/AndroidManifest.xml -F $RESOURCE_ZIP -S $PROJECT_DIR/res -I $PLATFORM_SDK/android.jar
$ANDROID_SDK/platform-tools/aapt package -f -M $PROJECT_DIR/AndroidManifest.xml -F $RESOURCE_ZIP -S $PROJECT_DIR/res -I $PLATFORM_SDK/android.jar
# Exit on failure
if [ $? -ne 0 ]; then exit 1; fi

Expand Down