[Android] Blind fix at SlidingMenu
Edward Wang
git at videolan.org
Fri Sep 28 01:28:54 CEST 2012
vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Thu Sep 27 19:28:44 2012 -0400| [e70ba514327a1c8bfa9cad22d19d632a8cd7de50] | committer: Edward Wang
Blind fix at SlidingMenu
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=e70ba514327a1c8bfa9cad22d19d632a8cd7de50
---
java-libs/SlidingMenu/build.xml | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/java-libs/SlidingMenu/build.xml b/java-libs/SlidingMenu/build.xml
index f60a254..828a18c 100644
--- a/java-libs/SlidingMenu/build.xml
+++ b/java-libs/SlidingMenu/build.xml
@@ -28,15 +28,6 @@
-->
<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.
@@ -48,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 the ANDROID_HOME environment variable."
More information about the Android
mailing list