diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-12-05 13:13:56 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-05 13:13:57 -0800 |
| commit | 6ecf7a13a0dc2dbdfce71c83d86328ec6c80b6e3 (patch) | |
| tree | cdc2831e9f4ed14f08aae925fdef0444908a8016 /files | |
| parent | cb7a3df75e1fbef2f4de805f65008e0bbd085217 (diff) | |
| parent | 131459f779b1a98bf354663298637589a2860fff (diff) | |
| download | sdk-6ecf7a13a0dc2dbdfce71c83d86328ec6c80b6e3.zip sdk-6ecf7a13a0dc2dbdfce71c83d86328ec6c80b6e3.tar.gz sdk-6ecf7a13a0dc2dbdfce71c83d86328ec6c80b6e3.tar.bz2 | |
Merge "Support package conflicts between app and libs."
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index acba923..e3ae78a 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -674,6 +674,7 @@ command="package" verbose="${verbose}" manifest="${out.manifest.abs.file}" + originalManifestPackage="${project.app.package}" androidjar="${project.target.android.jar}" rfolder="${gen.absolute.dir}" nonConstantId="${android.library}" |