[Libreoffice-commits] core.git: Branch 'feature/androidapp' - android/Bootstrap

[Michael Meeks]

 android/Bootstrap/Makefile.shared |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 408d942f97f3a8611adc9cc0511c290e318ee2c0
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Feb 15 20:00:21 2013 +0000

    android: detect updated sdk and re-generate troublesome ant rules.
    
    Change-Id: I147439e99892a5794a4bca880c5b3e22e46e1f86

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 6a02b11..1f13013 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -38,7 +38,7 @@ endef
 #
 # Horrors below:
 #
-$(BOOTSTRAPDIR)/no-resource-compress.xml :
+$(BOOTSTRAPDIR)/no-resource-compress.xml : $(ANDROID_SDK_HOME)/tools/ant/build.xml
 	( \
 	android_sdk_ver=`grep 'Pkg.Revision' $(ANDROID_SDK_HOME)/tools/source.properties | sed 's/^.*=//' | sed 's/\..*//'` ; \
 	cp $(BOOTSTRAPDIR)/no-resource-compress-$$android_sdk_ver.xml $(BOOTSTRAPDIR)/no-resource-compress.xml ; \
@@ -68,7 +68,7 @@ uninstall:
 
 clean: android_version_setup properties
 	$(ANT) clean
-	rm -rf assets libs $(SODEST) $(OBJLOCAL)
+	rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml
 
 #
 # Build / link the single .so for this app