mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the android_version_setup work better

Browse Source 
Change-Id: Ibc8f9df533c1fef3c1e428e62622ac2c56552498
This commit is contained in:
Tor Lillqvist
2012-11-25 17:36:50 +02:00
parent 0e7db6c33b
commit ae6431798e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/Bootstrap/Makefile.shared
View File

@@ -40,14 +40,13 @@ endef
# #
$(BOOTSTRAPDIR)/no-resource-compress.xml : $(BOOTSTRAPDIR)/no-resource-compress.xml :
( \ ( \
android_sdk_ver=`grep 'Pkg.Revision' /opt/libreoffice/android-sdk-linux/tools/source.properties | sed 's/^.*=//' | sed 's/\..*//'` ; \ android_sdk_ver=`grep 'Pkg.Revision' $(ANDROID_SDK_HOME)/tools/source.properties | sed 's/^.*=//' | sed 's/\..*//'` ; \
echo "Android SDK version is: $$android_sdk_ver"; \ cp $(BOOTSTRAPDIR)/no-resource-compress-$$android_sdk_ver.xml $(BOOTSTRAPDIR)/no-resource-compress.xml ; \
cp -a $(BOOTSTRAPDIR)/no-resource-compress-$$android_sdk_ver.xml $(BOOTSTRAPDIR)/no-resource-compress.xml ; \
if ! test -f $(BOOTSTRAPDIR)/no-resource-compress.xml; then \ if ! test -f $(BOOTSTRAPDIR)/no-resource-compress.xml; then \
echo "Unknown Android SDK version: $$android_sdk_ver - failing hard" \ echo "Unknown Android SDK version: $$android_sdk_ver"; \
exit 1; \ exit 1; \
fi \ fi \
) || exit 1 )
android_version_setup : $(BOOTSTRAPDIR)/no-resource-compress.xml android_version_setup : $(BOOTSTRAPDIR)/no-resource-compress.xml
@@ -67,7 +66,7 @@ install: build-ant
uninstall: uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
clean: properties clean: android_version_setup properties
$(ANT) clean $(ANT) clean
rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml