diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-01-21 12:43:03 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-01-26 10:27:41 +0100 |
| commit | 609367d3c92eb552514636d1176ae878b3417aa7 (patch) | |
| tree | 15f810662e4685f115ce167b03d521ed569a9ee6 | |
| parent | ef99aeea0e8f671dd0cb72aa311a80b8025f495d (diff) | |
android: Set the package name correctly.
Change-Id: Iab771f65121e477cda871a04098df306399628e7
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 4 | ||||
| -rw-r--r-- | android/Bootstrap/no-resource-compress-20.xml | 1 | ||||
| -rw-r--r-- | android/Bootstrap/no-resource-compress-21.xml | 1 | ||||
| -rw-r--r-- | android/Bootstrap/no-resource-compress-22.xml | 1 | ||||
| -rw-r--r-- | android/Bootstrap/no-resource-compress-23.xml | 1 | ||||
| -rw-r--r-- | android/Bootstrap/no-resource-compress-24.xml | 1 | ||||
| -rw-r--r-- | config_host.mk.in | 1 |
7 files changed, 8 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 33326465a680..fd48132a4c4e 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 d6fb92582d27..dd0fee0fcbe0 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 2b297826f0c8..c06f8391747c 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 2b297826f0c8..c06f8391747c 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 2b297826f0c8..c06f8391747c 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 2b297826f0c8..c06f8391747c 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 26e38eaf4332..ac811c991a05 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@ |