diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-25 17:36:50 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-25 17:38:21 +0200 |
| commit | ae6431798edd4f73892df746adb7795a645a9e99 (patch) | |
| tree | 193138520bb568dbb7731c587627198e6df6456a /android | |
| parent | 0e7db6c33bfa2c31439eb602065377428c8c700b (diff) | |
Make the android_version_setup work better
Change-Id: Ibc8f9df533c1fef3c1e428e62622ac2c56552498
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 75beab60135d..83e9b6a97bdb 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -40,14 +40,13 @@ endef # $(BOOTSTRAPDIR)/no-resource-compress.xml : ( \ - android_sdk_ver=`grep 'Pkg.Revision' /opt/libreoffice/android-sdk-linux/tools/source.properties | sed 's/^.*=//' | sed 's/\..*//'` ; \ - echo "Android SDK version is: $$android_sdk_ver"; \ - cp -a $(BOOTSTRAPDIR)/no-resource-compress-$$android_sdk_ver.xml $(BOOTSTRAPDIR)/no-resource-compress.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 ; \ 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; \ fi \ - ) || exit 1 + ) android_version_setup : $(BOOTSTRAPDIR)/no-resource-compress.xml @@ -67,7 +66,7 @@ install: build-ant uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) -clean: properties +clean: android_version_setup properties $(ANT) clean rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml |