diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-06 16:25:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-06 16:25:03 -0700 |
| commit | 82849afd719037968ddcb58e14cec8685f702216 (patch) | |
| tree | a16549c00299cb9ed039a2d1428c0b5561b378f1 /tools | |
| parent | a9570ab0439e7a734ef4ffc65e55dbf7f433d270 (diff) | |
| parent | 3442611ee11b2987c83054fe3c7ed5521f27f052 (diff) | |
| download | frameworks_base-82849afd719037968ddcb58e14cec8685f702216.zip frameworks_base-82849afd719037968ddcb58e14cec8685f702216.tar.gz frameworks_base-82849afd719037968ddcb58e14cec8685f702216.tar.bz2 | |
am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"
* commit '3442611ee11b2987c83054fe3c7ed5521f27f052':
Support changing style parent in overlays
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 1d6b18d..a77042a 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1724,13 +1724,6 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, // If a parent is explicitly specified, set it. if (bagParent.size() > 0) { - String16 curPar = e->getParent(); - if (curPar.size() > 0 && curPar != bagParent) { - sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n", - String8(e->getParent()).string(), - String8(bagParent).string()); - return UNKNOWN_ERROR; - } e->setParent(bagParent); } @@ -1778,13 +1771,6 @@ status_t ResourceTable::addBag(const SourcePos& sourcePos, // If a parent is explicitly specified, set it. if (bagParent.size() > 0) { - String16 curPar = e->getParent(); - if (curPar.size() > 0 && curPar != bagParent) { - sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n", - String8(e->getParent()).string(), - String8(bagParent).string()); - return UNKNOWN_ERROR; - } e->setParent(bagParent); } |