mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Set the package name correctly.

Browse Source 
Change-Id: Iab771f65121e477cda871a04098df306399628e7
This commit is contained in:
Jan Holesovsky
2015-01-21 12:43:03 +01:00
committed by Miklos Vajna
parent ef99aeea0e
commit 609367d3c9
7 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/Bootstrap/Makefile.shared
View File

@@ -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; \

1
android/Bootstrap/no-resource-compress-20.xml
View File

@@ -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}"

1
android/Bootstrap/no-resource-compress-21.xml
View File

@@ -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}"

1
android/Bootstrap/no-resource-compress-22.xml
View File

@@ -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}"

1
android/Bootstrap/no-resource-compress-23.xml
View File

@@ -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}"

1
android/Bootstrap/no-resource-compress-24.xml
View File

@@ -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}"

1
config_host.mk.in
View File

@@ -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@