diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-12-20 13:36:34 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-12-20 13:36:55 -0800 |
| commit | 3ff8e8bfafeeb31b24bc9fa9a8b3c8c0c6487af3 (patch) | |
| tree | c2785be03e0151f7b95c420a8173c41a7436096f /anttasks | |
| parent | 346f0a1a97c621f4c0dc3c31ffbfd89c5dca36cc (diff) | |
| download | sdk-3ff8e8bfafeeb31b24bc9fa9a8b3c8c0c6487af3.zip sdk-3ff8e8bfafeeb31b24bc9fa9a8b3c8c0c6487af3.tar.gz sdk-3ff8e8bfafeeb31b24bc9fa9a8b3c8c0c6487af3.tar.bz2 | |
Fix use case of app + 1 lib that have the same package in Ant.
Bug: 40273
Change-Id: I5009d3c95d677953a191145038d6d06cd8b2bf32
Diffstat (limited to 'anttasks')
| -rw-r--r-- | anttasks/src/com/android/ant/AaptExecTask.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/anttasks/src/com/android/ant/AaptExecTask.java b/anttasks/src/com/android/ant/AaptExecTask.java index f07cfad..257d1b9 100644 --- a/anttasks/src/com/android/ant/AaptExecTask.java +++ b/anttasks/src/com/android/ant/AaptExecTask.java @@ -731,7 +731,9 @@ public final class AaptExecTask extends SingleDependencyTask { // simpler case of a single library if (packages.length == 1) { - createRClass(fullSymbols, rFiles[0], packages[0]); + if (!mOriginalManifestPackage.equals(packages[0])) { + createRClass(fullSymbols, rFiles[0], packages[0]); + } } else { Map<String, String> libPackages = Maps.newHashMapWithExpectedSize( |