summaryrefslogtreecommitdiff
path: root/android/experimental
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-01 10:55:34 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-01 10:55:51 +0200
commit18e035964e92cb4348a4de0bafc4114608ed4754 (patch)
tree297d0af5e517f1c41f04b83e3d8d96fb41a6f7f5 /android/experimental
parent6a1cb54c31a0e7591173afa167938535bbe5cf6e (diff)
Cleanups to the android and ios makefilery
Also build the "desktop" app from gbuild. Change-Id: I45fc265c9515b22e10bd7644f54dbfa23601e063
Diffstat (limited to 'android/experimental')
-rw-r--r--android/experimental/DocumentLoader/Makefile2
-rw-r--r--android/experimental/LibreOffice4Android/Makefile2
-rw-r--r--android/experimental/desktop/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index c0e9ca8fb793..136f2010989b 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -125,7 +125,7 @@ build-ant: android_version_setup copy-stuff link-so properties
$(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
done
#
- unset JAVA_HOME && $(ANT) debug
+ unset JAVA_HOME && $(ANT) -quiet debug
run:
adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index d0ae325c3601..d33bcae6a3cb 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -128,7 +128,7 @@ build-ant: android_version_setup copy-stuff link-so properties
$(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
done
#
- unset JAVA_HOME && $(ANT) debug
+ unset JAVA_HOME && $(ANT) -quiet debug
run:
adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index 7069cb301876..d4b79454e0c1 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -153,7 +153,7 @@ setup-jars:
done
build-ant: android_version_setup copy-stuff link-so properties setup-jars
- unset JAVA_HOME && $(ANT) debug
+ unset JAVA_HOME && $(ANT) -quiet debug
run:
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/.Desktop