From 546948cb8c4c94795c66855899c9022ac714f361 Mon Sep 17 00:00:00 2001 From: Ian Clelland Date: Thu, 11 Jul 2013 22:24:52 -0400 Subject: [PATCH] [CB-4154] Set default Android target to android-17 This is done in the default project.properties file, as well as the create script for new projects. --- bin/create | 4 ++-- framework/project.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/create b/bin/create index 4dfd20f8..21f74781 100755 --- a/bin/create +++ b/bin/create @@ -83,8 +83,8 @@ PACKAGE_AS_PATH=$(echo $PACKAGE | sed 's/\./\//g') ACTIVITY_PATH="$PROJECT_PATH"/src/$PACKAGE_AS_PATH/$ACTIVITY.java MANIFEST_PATH="$PROJECT_PATH"/AndroidManifest.xml -TARGET=$("$ANDROID_BIN" list targets | grep id: | tail -1 | cut -f 2 -d ' ' ) -API_LEVEL=$("$ANDROID_BIN" list target | grep "API level:" | tail -n 1 | cut -f 2 -d ':' | tr -d ' ') +TARGET=$("$ANDROID_BIN" list targets -c | grep '^android-' | tail -1 ) +API_LEVEL=${TARGET##android-} # check that build targets exist if [ -z "$TARGET" ] || [ -z "$API_LEVEL" ] diff --git a/framework/project.properties b/framework/project.properties index d556741d..2f39d915 100644 --- a/framework/project.properties +++ b/framework/project.properties @@ -10,7 +10,7 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=Google Inc.:Google APIs:17 +target=android-17 apk-configurations= renderscript.opt.level=O0 android.library=true