summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-08-03 11:45:55 +0300
committerTor Lillqvist <tml@iki.fi>2012-08-03 12:09:32 +0300
commit1e1b85848224ae90ecc874829a7446b8e7b4793c (patch)
tree19fd9e2a005751bf8aae37d09557e11d51f4b051 /android
parentf6dc6f14352c615fe45433cca5d1a00de97107ab (diff)
Update for current SDK
Change-Id: I247075d5c8cef86a29a4c7fef03241396b2d76b7
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LibreOffice4Android/build.xml11
1 files changed, 6 insertions, 5 deletions
diff --git a/android/experimental/LibreOffice4Android/build.xml b/android/experimental/LibreOffice4Android/build.xml
index 5d960196c6b0..5b9550cbf197 100644
--- a/android/experimental/LibreOffice4Android/build.xml
+++ b/android/experimental/LibreOffice4Android/build.xml
@@ -92,17 +92,18 @@
versioncode="${version.code}"
versionname="${version.name}"
debug="${build.is.packaging.debug}"
- manifest="AndroidManifest.xml"
+ manifest="${out.manifest.abs.file}"
assets="${asset.absolute.dir}"
- androidjar="${android.jar}"
+ androidjar="${project.target.android.jar}"
apkfolder="${out.absolute.dir}"
nocrunch="${build.packaging.nocrunch}"
resourcefilename="${resource.package.file.name}"
resourcefilter="${aapt.resource.filter}"
- projectLibrariesResName="project.libraries.res"
- projectLibrariesPackageName="project.libraries.package"
+ libraryResFolderPathRefid="project.library.res.folder.path"
+ libraryPackagesRefid="project.library.packages"
previousBuildType="${build.last.target}"
- buildType="${build.target}">
+ buildType="${build.target}"
+ ignoreAssets="${aapt.ignore.assets}">
<res path="${out.res.absolute.dir}" />
<res path="${resource.absolute.dir}" />
<nocompress /> <!-- forces no compression on any files in assets or res/raw -->