diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-24 16:34:33 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-24 16:42:47 +0000 |
| commit | aaaf5126c6a465b2758c111f41bb4f55d39b3fe0 (patch) | |
| tree | 219fd31180b60469aa2a263b67899238072f2ad9 /android/experimental | |
| parent | 4ae193b308e86b91393b60a1a5f84037a4c40f30 (diff) | |
android: adapt the ant clobbering to a given SDK version.
Another volunteer fell over this, and (I hope) it's easy enough.
Change-Id: I7149d16fd8b7749afeeccef2ebc8f493200f1900
Diffstat (limited to 'android/experimental')
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 26 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 5 |
2 files changed, 7 insertions, 24 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 1551822958fa..880a0320c6b8 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -1,5 +1,8 @@ include ../../../config_host.mk +BOOTSTRAPDIR=../../Bootstrap +include $(BOOTSTRAPDIR)/Makefile.shared + # The package of this app APP_PACKAGE=org.libreoffice.android.examples @@ -39,13 +42,6 @@ WHOLELIBS = \ all: build-ant -properties: - echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties - echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties - echo "# File needed by ndk-gdb" >jni/Application.mk - echo "APP_ABI := $(ANDROID_APP_ABI)" >>jni/Application.mk - echo "APP_PLATFORM := android-14" >>jni/Application.mk - link-so: # Build the single .so for this app mkdir -p $(OBJLOCAL) @@ -156,7 +152,7 @@ copy-stuff: cp $(ANDROID_NDK_GDBSERVER) $(SODEST) echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup -build-ant: copy-stuff link-so properties +build-ant: android_version_setup copy-stuff link-so properties # # Copy jar files we need # @@ -173,19 +169,5 @@ build-ant: copy-stuff link-so properties # unset JAVA_HOME && $(ANT) debug -install: build-ant - unset JAVA_HOME && $(ANT) debug install - @echo - @echo 'Run it with "make run"' - @echo - -uninstall: - $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) - run: adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt - - -clean: properties - $(ANT) clean - rm -rf assets libs $(SODEST) $(OBJLOCAL) diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index a33bd5a9d076..20627fdf4f4d 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -16,7 +16,8 @@ WHOLELIBS = \ all: build-ant -include ../../Bootstrap/Makefile.shared +BOOTSTRAPDIR=../../Bootstrap +include $(BOOTSTRAPDIR)/Makefile.shared # The package of this app APP_PACKAGE=org.libreoffice @@ -128,7 +129,7 @@ copy-stuff: cp $(ANDROID_NDK_GDBSERVER) $(SODEST) echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup -build-ant: copy-stuff link-so properties +build-ant: android_version_setup copy-stuff link-so properties echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties # ActionBarSherlock uses the v4 support library, apparently one needs to copy # it like this for it to be found |