You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2013/07/12 04:27:06 UTC
android commit: [CB-4154] Set default Android target to android-17
Updated Branches:
refs/heads/master 37c20c3f6 -> 546948cb8
[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.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/546948cb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/546948cb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/546948cb
Branch: refs/heads/master
Commit: 546948cb8c4c94795c66855899c9022ac714f361
Parents: 37c20c3
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Jul 11 22:24:52 2013 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Jul 11 22:26:15 2013 -0400
----------------------------------------------------------------------
bin/create | 4 ++--
framework/project.properties | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/546948cb/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index 4dfd20f..21f7478 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" ]
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/546948cb/framework/project.properties
----------------------------------------------------------------------
diff --git a/framework/project.properties b/framework/project.properties
index d556741..2f39d91 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