android/Bootstrap/Makefile.shared | 4 ++-- android/Bootstrap/no-resource-compress-20.xml | 1 + android/Bootstrap/no-resource-compress-21.xml | 1 + android/Bootstrap/no-resource-compress-22.xml | 1 + android/Bootstrap/no-resource-compress-23.xml | 1 + android/Bootstrap/no-resource-compress-24.xml | 1 + android/CustomTarget_android_desktop.mk | 2 +- android/CustomTarget_lo_android.mk | 2 +- android/experimental/LOAndroid3/Makefile | 3 ++- config_host.mk.in | 1 + 10 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit d79b6e6ba84e3a7354753115b1d5afd0ac09a6c7 Author: Jan Holesovsky <[email protected]> Date: Wed Jan 21 12:50:51 2015 +0100 android: Set the debug / release according to the configure setting. Change-Id: Ic1c4328b21e1cdca2fdb1aee72b8563af8f770c7 diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile index e700daa..bc37149 100644 --- a/android/experimental/LOAndroid3/Makefile +++ b/android/experimental/LOAndroid3/Makefile @@ -7,6 +7,7 @@ endif all: build-ant # The package of this app +# The setting from configure (ANDROID_PACKAGE_NAME) is applied in later stages. APP_PACKAGE=org.libreoffice DISABLE_UI=TRUE @@ -33,7 +34,7 @@ build-ant: android_version_setup copy-stuff link-so properties $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \ done # - unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug + unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) $(if $(ENABLE_DEBUG),debug,release) run: adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt commit b23c057018758f469c6a26d2cc086fc4a3743a24 Author: Jan Holesovsky <[email protected]> Date: Wed Jan 21 12:44:03 2015 +0100 android: Fix release build via top level 'make'. Change-Id: I342e3dfd1e142d4be14162fd8a68876d038ed5ea diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk index e301ee9..715fd8c 100644 --- a/android/CustomTarget_android_desktop.mk +++ b/android/CustomTarget_android_desktop.mk @@ -27,7 +27,7 @@ $(android_desktop_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInst # the apps as such are mostly useless. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/experimental/desktop/bin/*.apk $(BUILDDIR)/instsetoo_native/foo/bin $(call gb_CustomTarget_get_clean_target,android/desktop) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 4d32cac..5ee53d4 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -27,7 +27,7 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa # the apps as such are mostly useless. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*.apk $(BUILDDIR)/instsetoo_native/foo/bin $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) commit 1bc5cb5f446ee7aeb4353fbfa80de6bb6788ea2c Author: Jan Holesovsky <[email protected]> Date: Wed Jan 21 12:43:03 2015 +0100 android: Set the package name correctly. Change-Id: Iab771f65121e477cda871a04098df306399628e7 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 3332646..fd48132 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -38,10 +38,10 @@ endef # # Horrors below: # -$(BOOTSTRAPDIR)/no-resource-compress.xml : $(ANDROID_SDK_HOME)/tools/ant/build.xml +$(BOOTSTRAPDIR)/no-resource-compress.xml : $(ANDROID_SDK_HOME)/tools/ant/build.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 ; \ + sed 's/@ANDROID_PACKAGE_NAME@/$(ANDROID_PACKAGE_NAME)/' < $(BOOTSTRAPDIR)/no-resource-compress-$$android_sdk_ver.xml > $@ ; \ if ! test -f $(BOOTSTRAPDIR)/no-resource-compress.xml; then \ echo "Unknown Android SDK version: $$android_sdk_ver"; \ exit 1; \ diff --git a/android/Bootstrap/no-resource-compress-20.xml b/android/Bootstrap/no-resource-compress-20.xml index d6fb925..dd0fee0 100644 --- a/android/Bootstrap/no-resource-compress-20.xml +++ b/android/Bootstrap/no-resource-compress-20.xml @@ -19,6 +19,7 @@ <do-only-if-not-library elseText="Library project: do not package resources..." > <aapt executable="${aapt}" command="package" + manifestpackage="@ANDROID_PACKAGE_NAME@" versioncode="${version.code}" versionname="${version.name}" debug="${build.is.packaging.debug}" diff --git a/android/Bootstrap/no-resource-compress-21.xml b/android/Bootstrap/no-resource-compress-21.xml index 2b29782..c06f839 100644 --- a/android/Bootstrap/no-resource-compress-21.xml +++ b/android/Bootstrap/no-resource-compress-21.xml @@ -19,6 +19,7 @@ <do-only-if-not-library elseText="Library project: do not package resources..." > <aapt executable="${aapt}" command="package" + manifestpackage="@ANDROID_PACKAGE_NAME@" versioncode="${version.code}" versionname="${version.name}" debug="${build.is.packaging.debug}" diff --git a/android/Bootstrap/no-resource-compress-22.xml b/android/Bootstrap/no-resource-compress-22.xml index 2b29782..c06f839 100644 --- a/android/Bootstrap/no-resource-compress-22.xml +++ b/android/Bootstrap/no-resource-compress-22.xml @@ -19,6 +19,7 @@ <do-only-if-not-library elseText="Library project: do not package resources..." > <aapt executable="${aapt}" command="package" + manifestpackage="@ANDROID_PACKAGE_NAME@" versioncode="${version.code}" versionname="${version.name}" debug="${build.is.packaging.debug}" diff --git a/android/Bootstrap/no-resource-compress-23.xml b/android/Bootstrap/no-resource-compress-23.xml index 2b29782..c06f839 100644 --- a/android/Bootstrap/no-resource-compress-23.xml +++ b/android/Bootstrap/no-resource-compress-23.xml @@ -19,6 +19,7 @@ <do-only-if-not-library elseText="Library project: do not package resources..." > <aapt executable="${aapt}" command="package" + manifestpackage="@ANDROID_PACKAGE_NAME@" versioncode="${version.code}" versionname="${version.name}" debug="${build.is.packaging.debug}" diff --git a/android/Bootstrap/no-resource-compress-24.xml b/android/Bootstrap/no-resource-compress-24.xml index 2b29782..c06f839 100644 --- a/android/Bootstrap/no-resource-compress-24.xml +++ b/android/Bootstrap/no-resource-compress-24.xml @@ -19,6 +19,7 @@ <do-only-if-not-library elseText="Library project: do not package resources..." > <aapt executable="${aapt}" command="package" + manifestpackage="@ANDROID_PACKAGE_NAME@" versioncode="${version.code}" versionname="${version.name}" debug="${build.is.packaging.debug}" diff --git a/config_host.mk.in b/config_host.mk.in index 26e38ea..ac811c9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -20,6 +20,7 @@ export ALL_LANGS=@ALL_LANGS@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@ export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@ +export ANDROID_PACKAGE_NAME=@ANDROID_PACKAGE_NAME@ export ANT=@ANT@ export ANT_HOME=@ANT_HOME@ export ANT_LIB=@ANT_LIB@ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
