diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-08-03 10:49:00 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-03 10:50:21 +0100 |
| commit | ab852cc0b6fe6e3a8b398b7fa0313a1425adf31b (patch) | |
| tree | b535de961c8751ff0bac5187c8672725cc2be2b7 /android/experimental | |
| parent | b18e6c7d2c35e781884c30af472143cd2fbc01a6 (diff) | |
android: share the clobbering of ant rules to not compress resources
Change-Id: Id2aa869f05b09dc22676d63390ec10bf575571ef
Diffstat (limited to 'android/experimental')
| -rw-r--r-- | android/experimental/DocumentLoader/build.xml | 32 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/build.xml | 32 |
2 files changed, 2 insertions, 62 deletions
diff --git a/android/experimental/DocumentLoader/build.xml b/android/experimental/DocumentLoader/build.xml index 09f65a90f6d3..e21b67b2c066 100644 --- a/android/experimental/DocumentLoader/build.xml +++ b/android/experimental/DocumentLoader/build.xml @@ -81,35 +81,5 @@ --> <!-- version-tag: custom --> <import file="${sdk.dir}/tools/ant/build.xml" /> - - <!-- Re-define the "-package-resources" target to not compress resources --> - - <target name="-package-resources" depends="-crunch"> - <!-- only package resources if *not* a library project --> - <do-only-if-not-library elseText="Library project: do not package resources..." > - <aapt executable="${aapt}" - command="package" - versioncode="${version.code}" - versionname="${version.name}" - debug="${build.is.packaging.debug}" - manifest="${out.manifest.abs.file}" - assets="${asset.absolute.dir}" - androidjar="${project.target.android.jar}" - apkfolder="${out.absolute.dir}" - nocrunch="${build.packaging.nocrunch}" - resourcefilename="${resource.package.file.name}" - resourcefilter="${aapt.resource.filter}" - libraryResFolderPathRefid="project.library.res.folder.path" - libraryPackagesRefid="project.library.packages" - previousBuildType="${build.last.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 --> - <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw --> - </aapt> - </do-only-if-not-library> - </target> - + <import file="${android.library.reference.1}/no-resource-compress.xml" /> </project> diff --git a/android/experimental/LibreOffice4Android/build.xml b/android/experimental/LibreOffice4Android/build.xml index 9b4ac265fcef..5ce5b75d7c70 100644 --- a/android/experimental/LibreOffice4Android/build.xml +++ b/android/experimental/LibreOffice4Android/build.xml @@ -81,35 +81,5 @@ --> <!-- version-tag: 1 --> <import file="${sdk.dir}/tools/ant/build.xml" /> - - <!-- Re-define the "-package-resources" target to not compress resources --> - - <target name="-package-resources" depends="-crunch"> - <!-- only package resources if *not* a library project --> - <do-only-if-not-library elseText="Library project: do not package resources..." > - <aapt executable="${aapt}" - command="package" - versioncode="${version.code}" - versionname="${version.name}" - debug="${build.is.packaging.debug}" - manifest="${out.manifest.abs.file}" - assets="${asset.absolute.dir}" - androidjar="${project.target.android.jar}" - apkfolder="${out.absolute.dir}" - nocrunch="${build.packaging.nocrunch}" - resourcefilename="${resource.package.file.name}" - resourcefilter="${aapt.resource.filter}" - libraryResFolderPathRefid="project.library.res.folder.path" - libraryPackagesRefid="project.library.packages" - previousBuildType="${build.last.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 --> - <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw --> - </aapt> - </do-only-if-not-library> - </target> - + <import file="${android.library.reference.1}/no-resource-compress.xml" /> </project> |