android/Bootstrap/local.properties.in | 2 ++ android/qa/desktop/Makefile | 7 ++++--- android/qa/sc/Makefile | 6 +++--- configure.in | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-)
New commits: commit 10d74d9afe286aeb9a19a9943dbeaa17a499e202 Author: Tor Lillqvist <[email protected]> Date: Fri Feb 3 12:47:05 2012 +0200 Need also android/Bootstrap/local.properties diff --git a/android/Bootstrap/local.properties.in b/android/Bootstrap/local.properties.in new file mode 100644 index 0000000..27c8eb5 --- /dev/null +++ b/android/Bootstrap/local.properties.in @@ -0,0 +1,2 @@ +# Location of the SDK. This is only used by Ant. +sdk.dir=@ANDROID_SDK_HOME@ diff --git a/configure.in b/configure.in index 9a348e3..3e6ba1c 100644 --- a/configure.in +++ b/configure.in @@ -2960,6 +2960,7 @@ if test "$cross_compiling" = "yes"; then tar cf - \ bin/repo-list.in \ build_env.in \ + android/Bootstrap/local.properties.in \ android/qa/sc/local.properties.in \ android/qa/desktop/local.properties.in \ config.guess \ @@ -10486,7 +10487,7 @@ else echo > set_soenv.last fi -AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list build_env android/qa/sc/local.properties android/qa/desktop/local.properties]) +AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list build_env android/Bootstrap/local.properties android/qa/sc/local.properties android/qa/desktop/local.properties]) AC_OUTPUT # touch the config timestamp file set_soenv.stamp commit b2aafed24427b8a803892020b5a260404ade0074 Author: Tor Lillqvist <[email protected]> Date: Fri Feb 3 12:46:19 2012 +0200 Use $ANT diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index d5e93be..ec568b6 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -235,11 +235,11 @@ copy-stuff: buildrcs build-ant: copy-stuff - unset JAVA_HOME && ant debug + unset JAVA_HOME && $ANT debug install: copy-stuff adb shell rm -r $(APP_DATA_PATH) - unset JAVA_HOME && ant debug install + unset JAVA_HOME && $ANT debug install @echo @echo 'Run it with "make run"' @echo @@ -260,6 +260,6 @@ stop-start-cycle: adb shell stop && adb shell start && sleep 10 clean: - ant clean + $ANT clean rm -rf assets $(SODEST) $(OBJLOCAL) diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 84341ab..ad07d28 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -165,10 +165,10 @@ copy-stuff: build-ant: copy-stuff - unset JAVA_HOME && ant debug + unset JAVA_HOME && $ANT debug install: copy-stuff - unset JAVA_HOME && ant debug install + unset JAVA_HOME && $ANT debug install @echo @echo 'Run it with "make run"' @echo @@ -199,6 +199,6 @@ redirect-stdio: adb shell stop && adb shell setprop log.redirect-stdio true && adb shell start clean: - ant clean + $ANT clean rm -rf assets $(SODEST) $(OBJLOCAL) commit 0bed666e281467c4ddd956e95ae1dbe65a60c238 Author: Tor Lillqvist <[email protected]> Date: Fri Feb 3 12:44:46 2012 +0200 Need liblnglo too diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 553aefe..d5e93be 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -136,6 +136,7 @@ copy-stuff: buildrcs icuuclo \ jvmaccessgcc3 \ jvmfwk \ + lnglo \ localebe1.uno \ localedata_en \ localedata_es \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
