diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-06-30 10:13:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-06-30 10:16:05 +0300 |
| commit | f7e4239ce420c09f3a60339edf10c3a96acb59e5 (patch) | |
| tree | 7f5883f9a017bce6714480edeaaf5bb4e6200bb7 /android | |
| parent | 8841e75d5af26f96e3ac168474a03d956bd7bb40 (diff) | |
Update for SDK tools rev 20
Change-Id: I482d0a488e9de5b59ce74b9c4057b4103fb048dc
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/DocumentLoader/build.xml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/android/experimental/DocumentLoader/build.xml b/android/experimental/DocumentLoader/build.xml index 5d960196c6b0..09f65a90f6d3 100644 --- a/android/experimental/DocumentLoader/build.xml +++ b/android/experimental/DocumentLoader/build.xml @@ -79,7 +79,7 @@ In all cases you must update the value of version-tag below to read 'custom' instead of an integer, in order to avoid having your file be overridden by tools such as "android update project" --> - <!-- version-tag: 1 --> + <!-- version-tag: custom --> <import file="${sdk.dir}/tools/ant/build.xml" /> <!-- Re-define the "-package-resources" target to not compress resources --> @@ -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 --> |