[Android] ActionBarSherlock: use an env variable to find the SDK path
Ludovic Fauvet
git at videolan.org
Wed Jun 20 23:44:04 CEST 2012
android | branch: master | Ludovic Fauvet <etix at videolan.org> | Wed Jun 20 22:30:48 2012 +0200| [8f35b52283e3cd54390449c6078de374f9602af8] | committer: Ludovic Fauvet
ActionBarSherlock: use an env variable to find the SDK path
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=8f35b52283e3cd54390449c6078de374f9602af8
---
java-libs/ActionBarSherlock/build.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/java-libs/ActionBarSherlock/build.xml b/java-libs/ActionBarSherlock/build.xml
index b02fe8f..fbd2457 100644
--- a/java-libs/ActionBarSherlock/build.xml
+++ b/java-libs/ActionBarSherlock/build.xml
@@ -39,6 +39,14 @@
application and should be checked into Version Control Systems. -->
<loadproperties srcFile="project.properties" />
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_SDK}" >
+ <and>
+ <not><isset property="${env.ANDROID_SDK}"/></not>
+ <not><isset property="sdk.dir"/></not>
+ </and>
+ </condition>
+
<!-- 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"
More information about the Android
mailing list