diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-12-26 22:05:20 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-12-26 22:05:20 +0100 |
| commit | 1dd685ecb086fa32a4368087f1735a519e6968bc (patch) | |
| tree | 6c4295b8020953e2758c1572e0bf6780c6703fd0 | |
| parent | e8ba991886032284ca40b989706b52ed17fd162d (diff) | |
| download | open-keychain-1dd685ecb086fa32a4368087f1735a519e6968bc.tar.gz open-keychain-1dd685ecb086fa32a4368087f1735a519e6968bc.tar.bz2 open-keychain-1dd685ecb086fa32a4368087f1735a519e6968bc.zip | |
Fix referencing of actionbarsherlock
| -rw-r--r-- | APG/android-libs/ActionBarSherlock/build.xml | 2 | ||||
| -rw-r--r-- | APG/build.xml | 13 | ||||
| -rw-r--r-- | APG/project.properties | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/APG/android-libs/ActionBarSherlock/build.xml b/APG/android-libs/ActionBarSherlock/build.xml index 56bc65293..a10a91491 100644 --- a/APG/android-libs/ActionBarSherlock/build.xml +++ b/APG/android-libs/ActionBarSherlock/build.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="ActionBarSherlock" default="help"> +<project name="MainActivity" default="help"> <!-- The local.properties file is created and updated by the 'android' tool. It contains the path to the SDK. It should *NOT* be checked into diff --git a/APG/build.xml b/APG/build.xml index eb9b68df7..a10a91491 100644 --- a/APG/build.xml +++ b/APG/build.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="APG" default="help"> +<project name="MainActivity" default="help"> <!-- The local.properties file is created and updated by the 'android' tool. It contains the path to the SDK. It should *NOT* be checked into @@ -28,6 +28,15 @@ --> <property file="ant.properties" /> + <!-- if sdk.dir was not set from one of the property file, then + get it from the ANDROID_HOME env var. + This must be done before we load project.properties since + the proguard config can use sdk.dir --> + <property environment="env" /> + <condition property="sdk.dir" value="${env.ANDROID_HOME}"> + <isset property="env.ANDROID_HOME" /> + </condition> + <!-- The project.properties file is created and updated by the 'android' tool, as well as ADT. @@ -41,7 +50,7 @@ <!-- quick check on sdk.dir --> <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var" + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." unless="sdk.dir" /> diff --git a/APG/project.properties b/APG/project.properties index d39cb7982..63019788e 100644 --- a/APG/project.properties +++ b/APG/project.properties @@ -9,4 +9,4 @@ # Project target. target=android-15 -android.library.reference.1=../../CryptoCall-UI/CryptoCall-UI/android-libs/ActionBarSherlock +android.library.reference.1=android-libs/ActionBarSherlock |